Shorten "PConfiguration" to "PConfig" again, since the Wrapper is gone

This commit is contained in:
Philipp Holzer 2020-01-19 22:23:44 +01:00
parent cb80108957
commit d5a473abda
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
41 changed files with 219 additions and 216 deletions

View file

@ -22,7 +22,7 @@ $a = \Friendica\DI::app();
$a->runFrontend( $a->runFrontend(
$dice->create(\Friendica\App\Module::class), $dice->create(\Friendica\App\Module::class),
$dice->create(\Friendica\App\Router::class), $dice->create(\Friendica\App\Router::class),
$dice->create(\Friendica\Core\Config\IPConfiguration::class), $dice->create(\Friendica\Core\PConfig\IPConfig::class),
$dice->create(\Friendica\App\Authentication::class), $dice->create(\Friendica\App\Authentication::class),
$dice->create(\Friendica\App\Page::class) $dice->create(\Friendica\App\Page::class)
); );

View file

@ -8,9 +8,9 @@ use Exception;
use Friendica\App\Arguments; use Friendica\App\Arguments;
use Friendica\App\BaseURL; use Friendica\App\BaseURL;
use Friendica\App\Authentication; use Friendica\App\Authentication;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\IPConfiguration; use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Theme; use Friendica\Core\Theme;
@ -118,14 +118,14 @@ class App
private $process; private $process;
/** /**
* @var IPConfiguration * @var IPConfig
*/ */
private $pConfig; private $pConfig;
/** /**
* Returns the current config cache of this node * Returns the current config cache of this node
* *
* @return ConfigCache * @return Cache
*/ */
public function getConfigCache() public function getConfigCache()
{ {
@ -153,9 +153,9 @@ class App
* @param L10n $l10n The translator instance * @param L10n $l10n The translator instance
* @param App\Arguments $args The Friendica Arguments of the call * @param App\Arguments $args The Friendica Arguments of the call
* @param Core\Process $process The process methods * @param Core\Process $process The process methods
* @param IPConfiguration $pConfig Personal configuration * @param IPConfig $pConfig Personal configuration
*/ */
public function __construct(Database $database, IConfig $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IPConfiguration $pConfig) public function __construct(Database $database, IConfig $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IPConfig $pConfig)
{ {
$this->database = $database; $this->database = $database;
$this->config = $config; $this->config = $config;
@ -432,13 +432,14 @@ class App
* *
* @param App\Module $module The determined module * @param App\Module $module The determined module
* @param App\Router $router * @param App\Router $router
* @param IPConfiguration $pconfig * @param IPConfig $pconfig
* @param Authentication $auth The Authentication backend of the node * @param Authentication $auth The Authentication backend of the node
* @param App\Page $page The Friendica page printing container * @param App\Page $page The Friendica page printing container
*
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public function runFrontend(App\Module $module, App\Router $router, IPConfiguration $pconfig, Authentication $auth, App\Page $page) public function runFrontend(App\Module $module, App\Router $router, IPConfig $pconfig, Authentication $auth, App\Page $page)
{ {
$moduleName = $module->getName(); $moduleName = $module->getName();

View file

@ -9,7 +9,7 @@ namespace Friendica\App;
use Exception; use Exception;
use Friendica\App; use Friendica\App;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\IPConfiguration; use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Session; use Friendica\Core\Session;
use Friendica\Core\System; use Friendica\Core\System;
@ -46,7 +46,7 @@ class Authentication
private $cookie; private $cookie;
/** @var Session\ISession */ /** @var Session\ISession */
private $session; private $session;
/** @var IPConfiguration */ /** @var IPConfig */
private $pConfig; private $pConfig;
/** /**
@ -60,9 +60,9 @@ class Authentication
* @param LoggerInterface $logger * @param LoggerInterface $logger
* @param User\Cookie $cookie * @param User\Cookie $cookie
* @param Session\ISession $session * @param Session\ISession $session
* @param IPConfiguration $pConfig * @param IPConfig $pConfig
*/ */
public function __construct(IConfig $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\ISession $session, IPConfiguration $pConfig) public function __construct(IConfig $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\ISession $session, IPConfig $pConfig)
{ {
$this->config = $config; $this->config = $config;
$this->mode = $mode; $this->mode = $mode;

View file

@ -3,7 +3,7 @@
namespace Friendica\App; namespace Friendica\App;
use Detection\MobileDetect; use Detection\MobileDetect;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Util\BasePath; use Friendica\Util\BasePath;
@ -65,7 +65,7 @@ class Mode
* *
* @throws \Exception * @throws \Exception
*/ */
public function determine(BasePath $basepath, Database $database, ConfigCache $configCache) public function determine(BasePath $basepath, Database $database, Cache $configCache)
{ {
$mode = 0; $mode = 0;

View file

@ -8,7 +8,7 @@ use DOMXPath;
use Friendica\App; use Friendica\App;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\IPConfiguration; use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
@ -172,11 +172,11 @@ class Page implements ArrayAccess
* @param Module $module The loaded Friendica module * @param Module $module The loaded Friendica module
* @param L10n $l10n The l10n language instance * @param L10n $l10n The l10n language instance
* @param IConfig $config The Friendica configuration * @param IConfig $config The Friendica configuration
* @param IPConfiguration $pConfig The Friendica personal configuration (for user) * @param IPConfig $pConfig The Friendica personal configuration (for user)
* *
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
private function initHead(App $app, Module $module, L10n $l10n, IConfig $config, IPConfiguration $pConfig) private function initHead(App $app, Module $module, L10n $l10n, IConfig $config, IPConfig $pConfig)
{ {
$interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000); $interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000);
@ -348,11 +348,11 @@ class Page implements ArrayAccess
* @param Module $module The loaded Friendica module * @param Module $module The loaded Friendica module
* @param L10n $l10n The l10n language class * @param L10n $l10n The l10n language class
* @param IConfig $config The Configuration of this node * @param IConfig $config The Configuration of this node
* @param IPConfiguration $pconfig The personal/user configuration * @param IPConfig $pconfig The personal/user configuration
* *
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, IConfig $config, IPConfiguration $pconfig) public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, IConfig $config, IPConfig $pconfig)
{ {
$moduleName = $module->getName(); $moduleName = $module->getName();

View file

@ -20,7 +20,7 @@ class AutomaticInstallation extends Console
*/ */
private $appMode; private $appMode;
/** /**
* @var Config\Cache\ConfigCache * @var \Friendica\Core\Config\Cache
*/ */
private $configCache; private $configCache;
@ -89,7 +89,7 @@ Examples
HELP; HELP;
} }
public function __construct(App\Mode $appMode, Config\Cache\ConfigCache $configCache, Config\IConfig $config, Database $dba, array $argv = null) public function __construct(App\Mode $appMode, Config\Cache $configCache, Config\IConfig $config, Database $dba, array $argv = null)
{ {
parent::__construct($argv); parent::__construct($argv);
@ -242,12 +242,12 @@ HELP;
/** /**
* @param Installer $installer The Installer instance * @param Installer $installer The Installer instance
* @param Config\Cache\ConfigCache $configCache The config cache * @param \Friendica\Core\Config\Cache $configCache The config cache
* *
* @return bool true if checks were successfully, otherwise false * @return bool true if checks were successfully, otherwise false
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private function runBasicChecks(Installer $installer, Config\Cache\ConfigCache $configCache) private function runBasicChecks(Installer $installer, Config\Cache $configCache)
{ {
$checked = true; $checked = true;

View file

@ -2,7 +2,7 @@
namespace Friendica\Console; namespace Friendica\Console;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Core\Update; use Friendica\Core\Update;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
@ -22,7 +22,7 @@ class DatabaseStructure extends \Asika\SimpleConsole\Console
*/ */
private $dba; private $dba;
/** /**
* @var ConfigCache * @var Cache
*/ */
private $configCache; private $configCache;
@ -48,7 +48,7 @@ HELP;
return $help; return $help;
} }
public function __construct(Database $dba, ConfigCache $configCache, $argv = null) public function __construct(Database $dba, Cache $configCache, $argv = null)
{ {
parent::__construct($argv); parent::__construct($argv);

View file

@ -15,7 +15,7 @@ use Friendica\Model;
abstract class BaseConfig implements IConfig abstract class BaseConfig implements IConfig
{ {
/** /**
* @var Cache\ConfigCache * @var Cache
*/ */
protected $configCache; protected $configCache;
@ -25,10 +25,10 @@ abstract class BaseConfig implements IConfig
protected $configModel; protected $configModel;
/** /**
* @param Cache\ConfigCache $configCache The configuration cache (based on the config-files) * @param Cache $configCache The configuration cache (based on the config-files)
* @param Model\Config\Config $configModel The configuration model * @param Model\Config\Config $configModel The configuration model
*/ */
public function __construct(Cache\ConfigCache $configCache, Model\Config\Config $configModel) public function __construct(Cache $configCache, Model\Config\Config $configModel)
{ {
$this->configCache = $configCache; $this->configCache = $configCache;
$this->configModel = $configModel; $this->configModel = $configModel;

View file

@ -1,7 +1,9 @@
<?php <?php
namespace Friendica\Core\Config; namespace Friendica\Core;
use Friendica\Core\PConfig\Cache;
use Friendica\Core\PConfig\IPConfig;
use Friendica\Model; use Friendica\Model;
/** /**
@ -11,10 +13,10 @@ use Friendica\Model;
* The configuration cache (@see Cache\PConfigCache) is used for temporary caching of database calls. This will * The configuration cache (@see Cache\PConfigCache) is used for temporary caching of database calls. This will
* increase the performance. * increase the performance.
*/ */
abstract class PConfiguration implements IPConfiguration abstract class BasePConfig implements IPConfig
{ {
/** /**
* @var Cache\PConfigCache * @var Cache
*/ */
protected $configCache; protected $configCache;
@ -24,10 +26,10 @@ abstract class PConfiguration implements IPConfiguration
protected $configModel; protected $configModel;
/** /**
* @param Cache\PConfigCache $configCache The configuration cache * @param Cache $configCache The configuration cache
* @param Model\Config\PConfig $configModel The configuration model * @param Model\Config\PConfig $configModel The configuration model
*/ */
public function __construct(Cache\PConfigCache $configCache, Model\Config\PConfig $configModel) public function __construct(Cache $configCache, Model\Config\PConfig $configModel)
{ {
$this->configCache = $configCache; $this->configCache = $configCache;
$this->configModel = $configModel; $this->configModel = $configModel;
@ -36,7 +38,7 @@ abstract class PConfiguration implements IPConfiguration
/** /**
* Returns the Config Cache * Returns the Config Cache
* *
* @return Cache\PConfigCache * @return Cache
*/ */
public function getCache() public function getCache()
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Friendica\Core\Config\Cache; namespace Friendica\Core\Config;
use ParagonIE\HiddenString\HiddenString; use ParagonIE\HiddenString\HiddenString;
@ -9,7 +9,7 @@ use ParagonIE\HiddenString\HiddenString;
* Initial, all *.config.php files are loaded into this cache with the * Initial, all *.config.php files are loaded into this cache with the
* ConfigFileLoader ( @see ConfigFileLoader ) * ConfigFileLoader ( @see ConfigFileLoader )
*/ */
class ConfigCache class Cache
{ {
/** /**
* @var array * @var array

View file

@ -11,9 +11,7 @@ interface IConfig
/** /**
* Loads all configuration values of family into a cached storage. * Loads all configuration values of family into a cached storage.
* *
* All configuration values of the system are stored in the cache ( @see ConfigCache ) * All configuration values of the system are stored in the cache ( @param string $cat The category of the configuration value
*
* @param string $cat The category of the configuration value
* *
* @return void * @return void
*/ */
@ -67,7 +65,7 @@ interface IConfig
/** /**
* Returns the Config Cache * Returns the Config Cache
* *
* @return Cache\ConfigCache * @return Cache
*/ */
function getCache(); function getCache();
} }

View file

@ -20,10 +20,10 @@ class JitConfig extends BaseConfig
private $db_loaded; private $db_loaded;
/** /**
* @param Cache\ConfigCache $configCache The configuration cache (based on the config-files) * @param Cache $configCache The configuration cache (based on the config-files)
* @param Model\Config\Config $configModel The configuration model * @param Model\Config\Config $configModel The configuration model
*/ */
public function __construct(Cache\ConfigCache $configCache, Model\Config\Config $configModel) public function __construct(Cache $configCache, Model\Config\Config $configModel)
{ {
parent::__construct($configCache, $configModel); parent::__construct($configCache, $configModel);
$this->db_loaded = []; $this->db_loaded = [];

View file

@ -17,10 +17,10 @@ class PreloadConfig extends BaseConfig
private $config_loaded; private $config_loaded;
/** /**
* @param Cache\ConfigCache $configCache The configuration cache (based on the config-files) * @param Cache $configCache The configuration cache (based on the config-files)
* @param Model\Config\Config $configModel The configuration model * @param Model\Config\Config $configModel The configuration model
*/ */
public function __construct(Cache\ConfigCache $configCache, Model\Config\Config $configModel) public function __construct(Cache $configCache, Model\Config\Config $configModel)
{ {
parent::__construct($configCache, $configModel); parent::__construct($configCache, $configModel);
$this->config_loaded = false; $this->config_loaded = false;

View file

@ -6,7 +6,7 @@ namespace Friendica\Core;
use DOMDocument; use DOMDocument;
use Exception; use Exception;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\DI; use Friendica\DI;
@ -129,12 +129,12 @@ class Installer
* - Creates `config/local.config.php` * - Creates `config/local.config.php`
* - Installs Database Structure * - Installs Database Structure
* *
* @param ConfigCache $configCache The config cache with all config relevant information * @param Cache $configCache The config cache with all config relevant information
* *
* @return bool true if the config was created, otherwise false * @return bool true if the config was created, otherwise false
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function createConfig(ConfigCache $configCache) public function createConfig(Cache $configCache)
{ {
$basepath = $configCache->get('system', 'basepath'); $basepath = $configCache->get('system', 'basepath');
@ -618,12 +618,12 @@ class Installer
/** /**
* Setup the default cache for a new installation * Setup the default cache for a new installation
* *
* @param ConfigCache $configCache The configuration cache * @param Cache $configCache The configuration cache
* @param string $basePath The determined basepath * @param string $basePath The determined basepath
* *
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function setUpCache(ConfigCache $configCache, $basePath) public function setUpCache(Cache $configCache, $basePath)
{ {
$configCache->set('config', 'php_path' , $this->getPHPPath()); $configCache->set('config', 'php_path' , $this->getPHPPath());
$configCache->set('system', 'basepath' , $basePath); $configCache->set('system', 'basepath' , $basePath);

View file

@ -1,13 +1,13 @@
<?php <?php
namespace Friendica\Core\Config\Cache; namespace Friendica\Core\PConfig;
use ParagonIE\HiddenString\HiddenString; use ParagonIE\HiddenString\HiddenString;
/** /**
* The Friendica config cache for users * The Friendica config cache for users
*/ */
class PConfigCache class Cache
{ {
/** /**
* @var array * @var array

View file

@ -1,11 +1,11 @@
<?php <?php
namespace Friendica\Core\Config; namespace Friendica\Core\PConfig;
/** /**
* Interface for accessing user specific configurations * Interface for accessing user specific configurations
*/ */
interface IPConfiguration interface IPConfig
{ {
/** /**
@ -17,7 +17,7 @@ interface IPConfiguration
* @param string $cat The category of the configuration value * @param string $cat The category of the configuration value
* *
* @return void * @return void
* @see PConfigCache * @see Cache
* *
*/ */
function load(int $uid, string $cat = 'config'); function load(int $uid, string $cat = 'config');
@ -76,7 +76,7 @@ interface IPConfiguration
/** /**
* Returns the Config Cache * Returns the Config Cache
* *
* @return Cache\PConfigCache * @return Cache
*/ */
function getCache(); function getCache();
} }

View file

@ -1,7 +1,8 @@
<?php <?php
namespace Friendica\Core\Config; namespace Friendica\Core\PConfig;
use Friendica\Core\BasePConfig;
use Friendica\Model; use Friendica\Model;
/** /**
@ -11,7 +12,7 @@ use Friendica\Model;
* Default Configuration type. * Default Configuration type.
* Provides the best performance for pages loading few configuration variables. * Provides the best performance for pages loading few configuration variables.
*/ */
class JitPConfiguration extends PConfiguration class JitPConfig extends BasePConfig
{ {
/** /**
* @var array Array of already loaded db values (even if there was no value) * @var array Array of already loaded db values (even if there was no value)
@ -19,10 +20,10 @@ class JitPConfiguration extends PConfiguration
private $db_loaded; private $db_loaded;
/** /**
* @param Cache\PConfigCache $configCache The configuration cache * @param Cache $configCache The configuration cache
* @param Model\Config\PConfig $configModel The configuration model * @param Model\Config\PConfig $configModel The configuration model
*/ */
public function __construct(Cache\PConfigCache $configCache, Model\Config\PConfig $configModel) public function __construct(Cache $configCache, Model\Config\PConfig $configModel)
{ {
parent::__construct($configCache, $configModel); parent::__construct($configCache, $configModel);
$this->db_loaded = []; $this->db_loaded = [];

View file

@ -1,7 +1,8 @@
<?php <?php
namespace Friendica\Core\Config; namespace Friendica\Core\PConfig;
use Friendica\Core\BasePConfig;
use Friendica\Model; use Friendica\Model;
/** /**
@ -10,16 +11,16 @@ use Friendica\Model;
* *
* Minimizes the number of database queries to retrieve configuration values at the cost of memory. * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
*/ */
class PreloadPConfiguration extends PConfiguration class PreloadPConfig extends BasePConfig
{ {
/** @var array */ /** @var array */
private $config_loaded; private $config_loaded;
/** /**
* @param Cache\PConfigCache $configCache The configuration cache * @param Cache $configCache The configuration cache
* @param Model\Config\PConfig $configModel The configuration model * @param Model\Config\PConfig $configModel The configuration model
*/ */
public function __construct(Cache\PConfigCache $configCache, Model\Config\PConfig $configModel) public function __construct(Cache $configCache, Model\Config\PConfig $configModel)
{ {
parent::__construct($configCache, $configModel); parent::__construct($configCache, $configModel);
$this->config_loaded = []; $this->config_loaded = [];

View file

@ -141,11 +141,11 @@ abstract class DI
} }
/** /**
* @return Core\Config\IPConfiguration * @return \Friendica\Core\PConfig\IPConfig
*/ */
public static function pConfig() public static function pConfig()
{ {
return self::$dice->create(Core\Config\IPConfiguration::class); return self::$dice->create(Core\PConfig\IPConfig::class);
} }
/** /**

View file

@ -2,7 +2,7 @@
namespace Friendica\Database; namespace Friendica\Database;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -25,7 +25,7 @@ class Database
protected $connected = false; protected $connected = false;
/** /**
* @var ConfigCache * @var Cache
*/ */
protected $configCache; protected $configCache;
/** /**
@ -47,7 +47,7 @@ class Database
protected $in_retrial = false; protected $in_retrial = false;
private $relation = []; private $relation = [];
public function __construct(ConfigCache $configCache, Profiler $profiler, LoggerInterface $logger, array $server = []) public function __construct(Cache $configCache, Profiler $profiler, LoggerInterface $logger, array $server = [])
{ {
// We are storing these values for being able to perform a reconnect // We are storing these values for being able to perform a reconnect
$this->configCache = $configCache; $this->configCache = $configCache;

View file

@ -13,23 +13,23 @@ class ConfigFactory
/** /**
* @param ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig) * @param ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig)
* *
* @return Cache\ConfigCache * @return Cache
*/ */
public function createCache(ConfigFileLoader $loader) public function createCache(ConfigFileLoader $loader)
{ {
$configCache = new Cache\ConfigCache(); $configCache = new Cache();
$loader->setupCache($configCache); $loader->setupCache($configCache);
return $configCache; return $configCache;
} }
/** /**
* @param Cache\ConfigCache $configCache The config cache of this adapter * @param Cache $configCache The config cache of this adapter
* @param ConfigModel $configModel The configuration model * @param ConfigModel $configModel The configuration model
* *
* @return Config\IConfig * @return Config\IConfig
*/ */
public function createConfig(Cache\ConfigCache $configCache, ConfigModel $configModel) public function createConfig(Cache $configCache, ConfigModel $configModel)
{ {
if ($configCache->get('system', 'config_adapter') === 'preload') { if ($configCache->get('system', 'config_adapter') === 'preload') {
$configuration = new Config\PreloadConfig($configCache, $configModel); $configuration = new Config\PreloadConfig($configCache, $configModel);
@ -42,18 +42,18 @@ class ConfigFactory
} }
/** /**
* @param Cache\ConfigCache $configCache The config cache * @param Cache $configCache The config cache
* @param Cache\PConfigCache $pConfigCache The personal config cache * @param \Friendica\Core\PConfig\Cache $pConfigCache The personal config cache
* @param PConfigModel $configModel The configuration model * @param PConfigModel $configModel The configuration model
* *
* @return Config\IPConfiguration * @return \Friendica\Core\PConfig\IPConfig
*/ */
public function createPConfig(Cache\ConfigCache $configCache, Cache\PConfigCache $pConfigCache, PConfigModel $configModel) public function createPConfig(Cache $configCache, \Friendica\Core\PConfig\Cache $pConfigCache, PConfigModel $configModel)
{ {
if ($configCache->get('system', 'config_adapter') === 'preload') { if ($configCache->get('system', 'config_adapter') === 'preload') {
$configuration = new Config\PreloadPConfiguration($pConfigCache, $configModel); $configuration = new \Friendica\Core\PConfig\PreloadPConfig($pConfigCache, $configModel);
} else { } else {
$configuration = new Config\JitPConfiguration($pConfigCache, $configModel); $configuration = new \Friendica\Core\PConfig\JitPConfig($pConfigCache, $configModel);
} }
return $configuration; return $configuration;

View file

@ -6,7 +6,7 @@ use Exception;
use Friendica\App; use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML; use Friendica\Content\Text\HTML;
use Friendica\Core\Config\IPConfiguration; use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
@ -71,13 +71,13 @@ final class Notify
private $args; private $args;
/** @var App\BaseURL */ /** @var App\BaseURL */
private $baseUrl; private $baseUrl;
/** @var IPConfiguration */ /** @var IPConfig */
private $pConfig; private $pConfig;
/** @var LoggerInterface */ /** @var LoggerInterface */
private $logger; private $logger;
public function __construct(Database $dba, L10n $l10n, App\Arguments $args, App\BaseURL $baseUrl, public function __construct(Database $dba, L10n $l10n, App\Arguments $args, App\BaseURL $baseUrl,
IPConfiguration $pConfig, LoggerInterface $logger) IPConfig $pConfig, LoggerInterface $logger)
{ {
$this->dba = $dba; $this->dba = $dba;
$this->l10n = $l10n; $this->l10n = $l10n;

View file

@ -110,7 +110,7 @@ class Summary extends BaseAdminModule
// check legacy basepath settings // check legacy basepath settings
$configLoader = new ConfigFileLoader($a->getBasePath()); $configLoader = new ConfigFileLoader($a->getBasePath());
$configCache = new Config\Cache\ConfigCache(); $configCache = new Config\Cache();
$configLoader->setupCache($configCache); $configLoader->setupCache($configCache);
$confBasepath = $configCache->get('system', 'basepath'); $confBasepath = $configCache->get('system', 'basepath');
$currBasepath = DI::config()->get('system', 'basepath'); $currBasepath = DI::config()->get('system', 'basepath');

View file

@ -5,7 +5,7 @@ namespace Friendica\Module;
use Friendica\App; use Friendica\App;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core; use Friendica\Core;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
@ -332,13 +332,13 @@ class Install extends BaseModule
/** /**
* Checks the $_POST settings and updates the config Cache for it * Checks the $_POST settings and updates the config Cache for it
* *
* @param ConfigCache $configCache The current config cache * @param Cache $configCache The current config cache
* @param array $post The $_POST data * @param array $post The $_POST data
* @param string $cat The category of the setting * @param string $cat The category of the setting
* @param string $key The key of the setting * @param string $key The key of the setting
* @param null|string $default The default value * @param null|string $default The default value
*/ */
private static function checkSetting(ConfigCache $configCache, array $post, $cat, $key, $default = null) private static function checkSetting(Cache $configCache, array $post, $cat, $key, $default = null)
{ {
$configCache->set($cat, $key, $configCache->set($cat, $key,
Strings::escapeTags( Strings::escapeTags(

View file

@ -4,10 +4,10 @@ namespace Friendica\Util;
use Exception; use Exception;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
/** /**
* The ConfigFileLoader loads config-files and stores them in a ConfigCache ( @see ConfigCache ) * The ConfigFileLoader loads config-files and stores them in a ConfigCache ( @see Cache )
* *
* It is capable of loading the following config files: * It is capable of loading the following config files:
* - *.config.php (current) * - *.config.php (current)
@ -77,12 +77,12 @@ class ConfigFileLoader
* First loads the default value for all the configuration keys, then the legacy configuration files, then the * First loads the default value for all the configuration keys, then the legacy configuration files, then the
* expected local.config.php * expected local.config.php
* *
* @param ConfigCache $config The config cache to load to * @param Cache $config The config cache to load to
* @param bool $raw Setup the raw config format * @param bool $raw Setup the raw config format
* *
* @throws Exception * @throws Exception
*/ */
public function setupCache(ConfigCache $config, $raw = false) public function setupCache(Cache $config, $raw = false)
{ {
// Load static config files first, the order is important // Load static config files first, the order is important
$config->load($this->loadStaticConfig('defaults')); $config->load($this->loadStaticConfig('defaults'));
@ -128,13 +128,13 @@ class ConfigFileLoader
/** /**
* Tries to load the specified core-configuration into the config cache. * Tries to load the specified core-configuration into the config cache.
* *
* @param ConfigCache $config The Config cache * @param Cache $config The Config cache
* *
* @return array The config array (empty if no config found) * @return array The config array (empty if no config found)
* *
* @throws Exception if the configuration file isn't readable * @throws Exception if the configuration file isn't readable
*/ */
private function loadCoreConfig(ConfigCache $config) private function loadCoreConfig(Cache $config)
{ {
// try to load legacy ini-files first // try to load legacy ini-files first
foreach ($this->getConfigFiles(true) as $configFile) { foreach ($this->getConfigFiles(true) as $configFile) {

View file

@ -2,7 +2,7 @@
namespace Friendica\Util; namespace Friendica\Util;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\IConfig;
use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;
@ -56,9 +56,9 @@ class Profiler implements ContainerInterface
} }
/** /**
* @param ConfigCache $configCache The configuration cache * @param Cache $configCache The configuration cache
*/ */
public function __construct(ConfigCache $configCache) public function __construct(Cache $configCache)
{ {
$this->enabled = $configCache->get('system', 'profiler'); $this->enabled = $configCache->get('system', 'profiler');
$this->rendertime = $configCache->get('rendertime', 'callstack'); $this->rendertime = $configCache->get('rendertime', 'callstack');

View file

@ -60,7 +60,7 @@ return [
[Dice::INSTANCE => '$basepath'], [Dice::INSTANCE => '$basepath'],
], ],
], ],
Config\Cache\ConfigCache::class => [ Config\Cache::class => [
'instanceOf' => Factory\ConfigFactory::class, 'instanceOf' => Factory\ConfigFactory::class,
'call' => [ 'call' => [
['createCache', [], Dice::CHAIN_CALL], ['createCache', [], Dice::CHAIN_CALL],
@ -78,7 +78,7 @@ return [
['createConfig', [], Dice::CHAIN_CALL], ['createConfig', [], Dice::CHAIN_CALL],
], ],
], ],
Config\IPConfiguration::class => [ \Friendica\Core\PConfig\IPConfig::class => [
'instanceOf' => Factory\ConfigFactory::class, 'instanceOf' => Factory\ConfigFactory::class,
'call' => [ 'call' => [
['createPConfig', [], Dice::CHAIN_CALL], ['createPConfig', [], Dice::CHAIN_CALL],

View file

@ -52,9 +52,9 @@ trait AppMockTrait
$this->dice = \Mockery::mock(Dice::class)->makePartial(); $this->dice = \Mockery::mock(Dice::class)->makePartial();
$this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php'); $this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php');
$this->configMock = \Mockery::mock(Config\Cache\ConfigCache::class); $this->configMock = \Mockery::mock(Config\Cache::class);
$this->dice->shouldReceive('create') $this->dice->shouldReceive('create')
->with(Config\Cache\ConfigCache::class) ->with(Config\Cache::class)
->andReturn($this->configMock); ->andReturn($this->configMock);
$this->mode = \Mockery::mock(App\Mode::class); $this->mode = \Mockery::mock(App\Mode::class);
$this->dice->shouldReceive('create') $this->dice->shouldReceive('create')

View file

@ -6,7 +6,7 @@ use Dice\Dice;
use Friendica\App; use Friendica\App;
use Friendica\Core\Cache\ICache; use Friendica\Core\Cache\ICache;
use Friendica\Core\Cache\IMemoryCache; use Friendica\Core\Cache\IMemoryCache;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\IConfig;
use Friendica\Core\Lock\ILock; use Friendica\Core\Lock\ILock;
use Friendica\Database\Database; use Friendica\Database\Database;
@ -59,7 +59,7 @@ class dependencyCheck extends TestCase
$this->assertInstanceOf(ConfigFileLoader::class, $configFileLoader); $this->assertInstanceOf(ConfigFileLoader::class, $configFileLoader);
$configCache = new ConfigCache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
$this->assertNotEmpty($configCache->getAll()); $this->assertNotEmpty($configCache->getAll());
@ -77,7 +77,7 @@ class dependencyCheck extends TestCase
$this->assertInstanceOf(Profiler::class, $profiler); $this->assertInstanceOf(Profiler::class, $profiler);
$configCache = new ConfigCache([ $configCache = new Cache([
'system' => [ 'system' => [
'profiler' => true, 'profiler' => true,
], ],

View file

@ -8,7 +8,7 @@ namespace Friendica\Test;
use Dice\Dice; use Dice\Dice;
use Friendica\App; use Friendica\App;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\IPConfiguration; use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Session; use Friendica\Core\Session;
use Friendica\Core\Session\ISession; use Friendica\Core\Session\ISession;
@ -827,7 +827,7 @@ class ApiTest extends DatabaseTest
*/ */
public function testApiGetUserWithFrioSchema() public function testApiGetUserWithFrioSchema()
{ {
$pConfig = $this->dice->create(IPConfiguration::class); $pConfig = $this->dice->create(IPConfig::class);
$pConfig->set($this->selfUser['id'], 'frio', 'schema', 'red'); $pConfig->set($this->selfUser['id'], 'frio', 'schema', 'red');
$user = api_get_user($this->app); $user = api_get_user($this->app);
$this->assertSelfUser($user); $this->assertSelfUser($user);
@ -843,7 +843,7 @@ class ApiTest extends DatabaseTest
*/ */
public function testApiGetUserWithCustomFrioSchema() public function testApiGetUserWithCustomFrioSchema()
{ {
$pConfig = $this->dice->create(IPConfiguration::class); $pConfig = $this->dice->create(IPConfig::class);
$pConfig->set($this->selfUser['id'], 'frio', 'schema', '---'); $pConfig->set($this->selfUser['id'], 'frio', 'schema', '---');
$pConfig->set($this->selfUser['id'], 'frio', 'nav_bg', '#123456'); $pConfig->set($this->selfUser['id'], 'frio', 'nav_bg', '#123456');
$pConfig->set($this->selfUser['id'], 'frio', 'link_color', '#123456'); $pConfig->set($this->selfUser['id'], 'frio', 'link_color', '#123456');
@ -862,7 +862,7 @@ class ApiTest extends DatabaseTest
*/ */
public function testApiGetUserWithEmptyFrioSchema() public function testApiGetUserWithEmptyFrioSchema()
{ {
$pConfig = $this->dice->create(IPConfiguration::class); $pConfig = $this->dice->create(IPConfig::class);
$pConfig->set($this->selfUser['id'], 'frio', 'schema', '---'); $pConfig->set($this->selfUser['id'], 'frio', 'schema', '---');
$user = api_get_user($this->app); $user = api_get_user($this->app);
$this->assertSelfUser($user); $this->assertSelfUser($user);

View file

@ -29,7 +29,7 @@ class ModeTest extends MockedTest
private $databaseMock; private $databaseMock;
/** /**
* @var Config\Cache\ConfigCache|MockInterface * @var \Friendica\Core\Config\Cache|MockInterface
*/ */
private $configCacheMock; private $configCacheMock;
@ -41,7 +41,7 @@ class ModeTest extends MockedTest
$this->basePathMock = \Mockery::mock(BasePath::class); $this->basePathMock = \Mockery::mock(BasePath::class);
$this->databaseMock = \Mockery::mock(Database::class); $this->databaseMock = \Mockery::mock(Database::class);
$this->configCacheMock = \Mockery::mock(Config\Cache\ConfigCache::class); $this->configCacheMock = \Mockery::mock(Config\Cache::class);
} }
public function testItEmpty() public function testItEmpty()

View file

@ -5,7 +5,7 @@ namespace Friendica\Test\src\Console;
use Dice\Dice; use Dice\Dice;
use Friendica\App; use Friendica\App;
use Friendica\Console\AutomaticInstallation; use Friendica\Console\AutomaticInstallation;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Core\Installer; use Friendica\Core\Installer;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Logger; use Friendica\Core\Logger;
@ -37,7 +37,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
private $assertFileDb; private $assertFileDb;
/** /**
* @var ConfigCache The configuration cache to check after each test * @var Cache The configuration cache to check after each test
*/ */
private $configCache; private $configCache;
@ -79,7 +79,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
DI::init($this->dice); DI::init($this->dice);
$this->configCache = new ConfigCache(); $this->configCache = new Cache();
$this->configCache->set('system', 'basepath', $this->root->url()); $this->configCache->set('system', 'basepath', $this->root->url());
$this->configCache->set('config', 'php_path', trim(shell_exec('which php'))); $this->configCache->set('config', 'php_path', trim(shell_exec('which php')));
$this->configCache->set('system', 'theme', 'smarty3'); $this->configCache->set('system', 'theme', 'smarty3');

View file

@ -2,7 +2,7 @@
namespace Friendica\Test\src\Core\Config\Cache; namespace Friendica\Test\src\Core\Config\Cache;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
use ParagonIE\HiddenString\HiddenString; use ParagonIE\HiddenString\HiddenString;
@ -29,7 +29,7 @@ class ConfigCacheTest extends MockedTest
]; ];
} }
private function assertConfigValues($data, ConfigCache $configCache) private function assertConfigValues($data, Cache $configCache)
{ {
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
@ -44,7 +44,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testLoadConfigArray($data) public function testLoadConfigArray($data)
{ {
$configCache = new ConfigCache(); $configCache = new Cache();
$configCache->load($data); $configCache->load($data);
$this->assertConfigValues($data, $configCache); $this->assertConfigValues($data, $configCache);
@ -63,7 +63,7 @@ class ConfigCacheTest extends MockedTest
] ]
]; ];
$configCache = new ConfigCache(); $configCache = new Cache();
$configCache->load($data); $configCache->load($data);
$configCache->load($override); $configCache->load($override);
@ -81,7 +81,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testLoadConfigArrayWrong() public function testLoadConfigArrayWrong()
{ {
$configCache = new ConfigCache(); $configCache = new Cache();
// empty dataset // empty dataset
$configCache->load([]); $configCache->load([]);
@ -102,7 +102,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testGetAll($data) public function testGetAll($data)
{ {
$configCache = new ConfigCache(); $configCache = new Cache();
$configCache->load($data); $configCache->load($data);
$all = $configCache->getAll(); $all = $configCache->getAll();
@ -117,7 +117,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testSetGet($data) public function testSetGet($data)
{ {
$configCache = new ConfigCache(); $configCache = new Cache();
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
@ -133,7 +133,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testGetEmpty() public function testGetEmpty()
{ {
$configCache = new ConfigCache(); $configCache = new Cache();
$this->assertNull($configCache->get('something', 'value')); $this->assertNull($configCache->get('something', 'value'));
} }
@ -143,7 +143,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testGetCat() public function testGetCat()
{ {
$configCache = new ConfigCache([ $configCache = new Cache([
'system' => [ 'system' => [
'key1' => 'value1', 'key1' => 'value1',
'key2' => 'value2', 'key2' => 'value2',
@ -171,7 +171,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testDelete($data) public function testDelete($data)
{ {
$configCache = new ConfigCache($data); $configCache = new Cache($data);
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
@ -188,7 +188,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testKeyDiffWithResult($data) public function testKeyDiffWithResult($data)
{ {
$configCache = new ConfigCache($data); $configCache = new Cache($data);
$diffConfig = [ $diffConfig = [
'fakeCat' => [ 'fakeCat' => [
@ -205,7 +205,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testKeyDiffWithoutResult($data) public function testKeyDiffWithoutResult($data)
{ {
$configCache = new ConfigCache($data); $configCache = new Cache($data);
$diffConfig = $configCache->getAll(); $diffConfig = $configCache->getAll();
@ -217,7 +217,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testPasswordHide() public function testPasswordHide()
{ {
$configCache = new ConfigCache([ $configCache = new Cache([
'database' => [ 'database' => [
'password' => 'supersecure', 'password' => 'supersecure',
'username' => 'notsecured', 'username' => 'notsecured',
@ -234,7 +234,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testPasswordShow() public function testPasswordShow()
{ {
$configCache = new ConfigCache([ $configCache = new Cache([
'database' => [ 'database' => [
'password' => 'supersecure', 'password' => 'supersecure',
'username' => 'notsecured', 'username' => 'notsecured',
@ -251,7 +251,7 @@ class ConfigCacheTest extends MockedTest
*/ */
public function testEmptyPassword() public function testEmptyPassword()
{ {
$configCache = new ConfigCache([ $configCache = new Cache([
'database' => [ 'database' => [
'password' => '', 'password' => '',
'username' => '', 'username' => '',
@ -265,7 +265,7 @@ class ConfigCacheTest extends MockedTest
public function testWrongTypePassword() public function testWrongTypePassword()
{ {
$configCache = new ConfigCache([ $configCache = new Cache([
'database' => [ 'database' => [
'password' => new \stdClass(), 'password' => new \stdClass(),
'username' => '', 'username' => '',
@ -275,7 +275,7 @@ class ConfigCacheTest extends MockedTest
$this->assertNotEmpty($configCache->get('database', 'password')); $this->assertNotEmpty($configCache->get('database', 'password'));
$this->assertEmpty($configCache->get('database', 'username')); $this->assertEmpty($configCache->get('database', 'username'));
$configCache = new ConfigCache([ $configCache = new Cache([
'database' => [ 'database' => [
'password' => 23, 'password' => 23,
'username' => '', 'username' => '',

View file

@ -2,7 +2,7 @@
namespace Friendica\Test\src\Core\Config\Cache; namespace Friendica\Test\src\Core\Config\Cache;
use Friendica\Core\Config\Cache\PConfigCache; use Friendica\Core\PConfig\Cache;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
class PConfigCacheTest extends MockedTest class PConfigCacheTest extends MockedTest
@ -28,7 +28,7 @@ class PConfigCacheTest extends MockedTest
]; ];
} }
private function assertConfigValues($data, PConfigCache $configCache, $uid) private function assertConfigValues($data, Cache $configCache, $uid)
{ {
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
@ -44,7 +44,7 @@ class PConfigCacheTest extends MockedTest
*/ */
public function testSetGet($data) public function testSetGet($data)
{ {
$configCache = new PConfigCache(); $configCache = new Cache();
$uid = 345; $uid = 345;
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
@ -62,7 +62,7 @@ class PConfigCacheTest extends MockedTest
*/ */
public function testGetCat() public function testGetCat()
{ {
$configCache = new PConfigCache(); $configCache = new Cache();
$uid = 345; $uid = 345;
$configCache->load($uid, [ $configCache->load($uid, [
@ -94,7 +94,7 @@ class PConfigCacheTest extends MockedTest
*/ */
public function testDelete($data) public function testDelete($data)
{ {
$configCache = new PConfigCache(); $configCache = new Cache();
$uid = 345; $uid = 345;
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
@ -119,7 +119,7 @@ class PConfigCacheTest extends MockedTest
*/ */
public function testKeyDiffWithResult($data) public function testKeyDiffWithResult($data)
{ {
$configCache = new PConfigCache(); $configCache = new Cache();
$diffConfig = [ $diffConfig = [
'fakeCat' => [ 'fakeCat' => [
@ -137,7 +137,7 @@ class PConfigCacheTest extends MockedTest
*/ */
public function testKeyDiffWithoutResult($data) public function testKeyDiffWithoutResult($data)
{ {
$configCache = new PConfigCache(); $configCache = new Cache();
$configCache->load(1, $data); $configCache->load(1, $data);
@ -151,7 +151,7 @@ class PConfigCacheTest extends MockedTest
*/ */
public function testPasswordHide() public function testPasswordHide()
{ {
$configCache = new PConfigCache(); $configCache = new Cache();
$configCache->load(1, [ $configCache->load(1, [
'database' => [ 'database' => [
@ -170,7 +170,7 @@ class PConfigCacheTest extends MockedTest
*/ */
public function testPasswordShow() public function testPasswordShow()
{ {
$configCache = new PConfigCache(false); $configCache = new Cache(false);
$configCache->load(1, [ $configCache->load(1, [
'database' => [ 'database' => [
@ -189,7 +189,7 @@ class PConfigCacheTest extends MockedTest
*/ */
public function testEmptyPassword() public function testEmptyPassword()
{ {
$configCache = new PConfigCache(); $configCache = new Cache();
$configCache->load(1, [ $configCache->load(1, [
'database' => [ 'database' => [
@ -204,7 +204,7 @@ class PConfigCacheTest extends MockedTest
public function testWrongTypePassword() public function testWrongTypePassword()
{ {
$configCache = new PConfigCache(); $configCache = new Cache();
$configCache->load(1, [ $configCache->load(1, [
'database' => [ 'database' => [
@ -216,7 +216,7 @@ class PConfigCacheTest extends MockedTest
$this->assertNotEmpty($configCache->get(1, 'database', 'password')); $this->assertNotEmpty($configCache->get(1, 'database', 'password'));
$this->assertEmpty($configCache->get(1, 'database', 'username')); $this->assertEmpty($configCache->get(1, 'database', 'username'));
$configCache = new PConfigCache(); $configCache = new Cache();
$configCache->load(1, [ $configCache->load(1, [
'database' => [ 'database' => [
@ -234,7 +234,7 @@ class PConfigCacheTest extends MockedTest
*/ */
public function testTwoUid() public function testTwoUid()
{ {
$configCache = new PConfigCache(); $configCache = new Cache();
$configCache->load(1, [ $configCache->load(1, [
'cat1' => [ 'cat1' => [
@ -265,7 +265,7 @@ class PConfigCacheTest extends MockedTest
// bad UID! // bad UID!
$uid = null; $uid = null;
$configCache = new PConfigCache(); $configCache = new Cache();
$this->assertNull($configCache->get($uid, 'cat1', 'cat2')); $this->assertNull($configCache->get($uid, 'cat1', 'cat2'));

View file

@ -2,7 +2,7 @@
namespace Friendica\Test\src\Core\Config; namespace Friendica\Test\src\Core\Config;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\IConfig;
use Friendica\Model\Config\Config as ConfigModel; use Friendica\Model\Config\Config as ConfigModel;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
@ -14,7 +14,7 @@ abstract class ConfigurationTest extends MockedTest
/** @var ConfigModel|MockInterface */ /** @var ConfigModel|MockInterface */
protected $configModel; protected $configModel;
/** @var ConfigCache */ /** @var Cache */
protected $configCache; protected $configCache;
/** @var IConfig */ /** @var IConfig */
@ -42,7 +42,7 @@ abstract class ConfigurationTest extends MockedTest
// Create the config model // Create the config model
$this->configModel = Mockery::mock(ConfigModel::class); $this->configModel = Mockery::mock(ConfigModel::class);
$this->configCache = new ConfigCache(); $this->configCache = new Cache();
} }
/** /**
@ -142,7 +142,7 @@ abstract class ConfigurationTest extends MockedTest
->once(); ->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// assert config is loaded everytime // assert config is loaded everytime
$this->assertConfig('config', $data['config']); $this->assertConfig('config', $data['config']);
@ -154,7 +154,7 @@ abstract class ConfigurationTest extends MockedTest
public function testLoad(array $data, array $possibleCats, array $load) public function testLoad(array $data, array $possibleCats, array $load)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($load as $loadedCats) { foreach ($load as $loadedCats) {
$this->testedConfig->load($loadedCats); $this->testedConfig->load($loadedCats);
@ -235,7 +235,7 @@ abstract class ConfigurationTest extends MockedTest
public function testCacheLoadDouble(array $data1, array $data2, array $expect) public function testCacheLoadDouble(array $data1, array $data2, array $expect)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($data1 as $cat => $data) { foreach ($data1 as $cat => $data) {
$this->testedConfig->load($cat); $this->testedConfig->load($cat);
@ -260,7 +260,7 @@ abstract class ConfigurationTest extends MockedTest
$this->configModel->shouldReceive('load')->withAnyArgs()->andReturn([])->once(); $this->configModel->shouldReceive('load')->withAnyArgs()->andReturn([])->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertEmpty($this->testedConfig->getCache()->getAll()); $this->assertEmpty($this->testedConfig->getCache()->getAll());
} }
@ -277,7 +277,7 @@ abstract class ConfigurationTest extends MockedTest
->times(3); ->times(3);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertTrue($this->testedConfig->set('test', 'it', $data)); $this->assertTrue($this->testedConfig->set('test', 'it', $data));
@ -295,7 +295,7 @@ abstract class ConfigurationTest extends MockedTest
$this->configModel->shouldReceive('set')->with('test', 'it', $data)->andReturn(true)->once(); $this->configModel->shouldReceive('set')->with('test', 'it', $data)->andReturn(true)->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertTrue($this->testedConfig->set('test', 'it', $data)); $this->assertTrue($this->testedConfig->set('test', 'it', $data));
@ -309,7 +309,7 @@ abstract class ConfigurationTest extends MockedTest
public function testGetWrongWithoutDB() public function testGetWrongWithoutDB()
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// without refresh // without refresh
$this->assertNull($this->testedConfig->get('test', 'it')); $this->assertNull($this->testedConfig->get('test', 'it'));
@ -334,7 +334,7 @@ abstract class ConfigurationTest extends MockedTest
$this->configCache->load(['test' => ['it' => 'now']]); $this->configCache->load(['test' => ['it' => 'now']]);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// without refresh // without refresh
$this->assertEquals('now', $this->testedConfig->get('test', 'it')); $this->assertEquals('now', $this->testedConfig->get('test', 'it'));
@ -359,7 +359,7 @@ abstract class ConfigurationTest extends MockedTest
$this->configCache->load(['test' => ['it' => $data]]); $this->configCache->load(['test' => ['it' => $data]]);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertEquals($data, $this->testedConfig->get('test', 'it')); $this->assertEquals($data, $this->testedConfig->get('test', 'it'));
$this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it')); $this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
@ -396,7 +396,7 @@ abstract class ConfigurationTest extends MockedTest
->once(); ->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// directly set the value to the cache // directly set the value to the cache
$this->testedConfig->getCache()->set('test', 'it', 'now'); $this->testedConfig->getCache()->set('test', 'it', 'now');

View file

@ -2,13 +2,13 @@
namespace Friendica\Test\src\Core\Config; namespace Friendica\Test\src\Core\Config;
use Friendica\Core\Config\JitPConfiguration; use Friendica\Core\PConfig\JitPConfig;
class JitPConfigurationTest extends PConfigurationTest class JitPConfigurationTest extends PConfigurationTest
{ {
public function getInstance() public function getInstance()
{ {
return new JitPConfiguration($this->configCache, $this->configModel); return new JitPConfig($this->configCache, $this->configModel);
} }
/** /**

View file

@ -2,8 +2,8 @@
namespace Friendica\Test\src\Core\Config; namespace Friendica\Test\src\Core\Config;
use Friendica\Core\Config\Cache\PConfigCache; use Friendica\Core\PConfig\Cache;
use Friendica\Core\Config\PConfiguration; use Friendica\Core\BasePConfig;
use Friendica\Model\Config\PConfig as PConfigModel; use Friendica\Model\Config\PConfig as PConfigModel;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
use Mockery; use Mockery;
@ -14,10 +14,10 @@ abstract class PConfigurationTest extends MockedTest
/** @var PConfigModel|MockInterface */ /** @var PConfigModel|MockInterface */
protected $configModel; protected $configModel;
/** @var PConfigCache */ /** @var Cache */
protected $configCache; protected $configCache;
/** @var PConfiguration */ /** @var BasePConfig */
protected $testedConfig; protected $testedConfig;
/** /**
@ -44,11 +44,11 @@ abstract class PConfigurationTest extends MockedTest
// Create the config model // Create the config model
$this->configModel = Mockery::mock(PConfigModel::class); $this->configModel = Mockery::mock(PConfigModel::class);
$this->configCache = new PConfigCache(); $this->configCache = new Cache();
} }
/** /**
* @return PConfiguration * @return BasePConfig
*/ */
public abstract function getInstance(); public abstract function getInstance();
@ -145,7 +145,7 @@ abstract class PConfigurationTest extends MockedTest
public function testSetUp(int $uid, array $data) public function testSetUp(int $uid, array $data)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertEmpty($this->testedConfig->getCache()->getAll()); $this->assertEmpty($this->testedConfig->getCache()->getAll());
} }
@ -156,7 +156,7 @@ abstract class PConfigurationTest extends MockedTest
public function testLoad(int $uid, array $data, array $possibleCats, array $load) public function testLoad(int $uid, array $data, array $possibleCats, array $load)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($load as $loadedCats) { foreach ($load as $loadedCats) {
$this->testedConfig->load($uid, $loadedCats); $this->testedConfig->load($uid, $loadedCats);
@ -239,7 +239,7 @@ abstract class PConfigurationTest extends MockedTest
public function testCacheLoadDouble(int $uid, array $data1, array $data2, array $expect) public function testCacheLoadDouble(int $uid, array $data1, array $data2, array $expect)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($data1 as $cat => $data) { foreach ($data1 as $cat => $data) {
$this->testedConfig->load($uid, $cat); $this->testedConfig->load($uid, $cat);
@ -263,7 +263,7 @@ abstract class PConfigurationTest extends MockedTest
public function testSetGetWithoutDB(int $uid, $data) public function testSetGetWithoutDB(int $uid, $data)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertTrue($this->testedConfig->set($uid, 'test', 'it', $data)); $this->assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
@ -284,7 +284,7 @@ abstract class PConfigurationTest extends MockedTest
->once(); ->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertTrue($this->testedConfig->set($uid, 'test', 'it', $data)); $this->assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
@ -298,7 +298,7 @@ abstract class PConfigurationTest extends MockedTest
public function testGetWrongWithoutDB() public function testGetWrongWithoutDB()
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// without refresh // without refresh
$this->assertNull($this->testedConfig->get(0, 'test', 'it')); $this->assertNull($this->testedConfig->get(0, 'test', 'it'));
@ -323,7 +323,7 @@ abstract class PConfigurationTest extends MockedTest
$this->configCache->load($uid, ['test' => ['it' => 'now']]); $this->configCache->load($uid, ['test' => ['it' => 'now']]);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// without refresh // without refresh
$this->assertEquals('now', $this->testedConfig->get($uid, 'test', 'it')); $this->assertEquals('now', $this->testedConfig->get($uid, 'test', 'it'));
@ -348,7 +348,7 @@ abstract class PConfigurationTest extends MockedTest
$this->configCache->load($uid, ['test' => ['it' => $data]]); $this->configCache->load($uid, ['test' => ['it' => $data]]);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it')); $this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
$this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it')); $this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
@ -387,7 +387,7 @@ abstract class PConfigurationTest extends MockedTest
->once(); ->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// directly set the value to the cache // directly set the value to the cache
$this->testedConfig->getCache()->set($uid, 'test', 'it', 'now'); $this->testedConfig->getCache()->set($uid, 'test', 'it', 'now');
@ -447,7 +447,7 @@ abstract class PConfigurationTest extends MockedTest
$this->configCache->load($data2['uid'], $data2['data']); $this->configCache->load($data2['uid'], $data2['data']);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(PConfigCache::class, $this->testedConfig->getCache()); $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertConfig($data1['uid'], 'cat1', $data1['data']['cat1']); $this->assertConfig($data1['uid'], 'cat1', $data1['data']['cat1']);
$this->assertConfig($data1['uid'], 'cat2', $data1['data']['cat2']); $this->assertConfig($data1['uid'], 'cat2', $data1['data']['cat2']);

View file

@ -2,13 +2,13 @@
namespace Friendica\Test\src\Core\Config; namespace Friendica\Test\src\Core\Config;
use Friendica\Core\Config\PreloadPConfiguration; use Friendica\Core\PConfig\PreloadPConfig;
class PreloadPConfigurationTest extends PConfigurationTest class PreloadPConfigurationTest extends PConfigurationTest
{ {
public function getInstance() public function getInstance()
{ {
return new PreloadPConfiguration($this->configCache, $this->configModel); return new PreloadPConfig($this->configCache, $this->configModel);
} }
/** /**

View file

@ -4,7 +4,7 @@
namespace Friendica\Core; namespace Friendica\Core;
use Dice\Dice; use Dice\Dice;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\CurlResult; use Friendica\Network\CurlResult;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
@ -419,7 +419,7 @@ class InstallerTest extends MockedTest
$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; }); $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
$install = new Installer(); $install = new Installer();
$configCache = \Mockery::mock(ConfigCache::class); $configCache = \Mockery::mock(Cache::class);
$configCache->shouldReceive('set')->with('config', 'php_path', \Mockery::any())->once(); $configCache->shouldReceive('set')->with('config', 'php_path', \Mockery::any())->once();
$configCache->shouldReceive('set')->with('system', 'basepath', '/test/')->once(); $configCache->shouldReceive('set')->with('system', 'basepath', '/test/')->once();

View file

@ -2,7 +2,7 @@
namespace Friendica\Test\src\Util\Config; namespace Friendica\Test\src\Util\Config;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
use Friendica\Test\Util\VFSTrait; use Friendica\Test\Util\VFSTrait;
use Friendica\Util\ConfigFileLoader; use Friendica\Util\ConfigFileLoader;
@ -27,7 +27,7 @@ class ConfigFileLoaderTest extends MockedTest
$this->delConfigFile('local.config.php'); $this->delConfigFile('local.config.php');
$configFileLoader = new ConfigFileLoader($this->root->url()); $configFileLoader = new ConfigFileLoader($this->root->url());
$configCache = new ConfigCache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
@ -48,7 +48,7 @@ class ConfigFileLoaderTest extends MockedTest
->setContent('<?php return true;'); ->setContent('<?php return true;');
$configFileLoader = new ConfigFileLoader($this->root->url()); $configFileLoader = new ConfigFileLoader($this->root->url());
$configCache = new ConfigCache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
} }
@ -72,7 +72,7 @@ class ConfigFileLoaderTest extends MockedTest
->setContent(file_get_contents($file)); ->setContent(file_get_contents($file));
$configFileLoader = new ConfigFileLoader($this->root->url()); $configFileLoader = new ConfigFileLoader($this->root->url());
$configCache = new ConfigCache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
@ -104,7 +104,7 @@ class ConfigFileLoaderTest extends MockedTest
->setContent(file_get_contents($file)); ->setContent(file_get_contents($file));
$configFileLoader = new ConfigFileLoader($this->root->url()); $configFileLoader = new ConfigFileLoader($this->root->url());
$configCache = new ConfigCache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
@ -135,7 +135,7 @@ class ConfigFileLoaderTest extends MockedTest
->setContent(file_get_contents($file)); ->setContent(file_get_contents($file));
$configFileLoader = new ConfigFileLoader($this->root->url()); $configFileLoader = new ConfigFileLoader($this->root->url());
$configCache = new ConfigCache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
@ -216,7 +216,7 @@ class ConfigFileLoaderTest extends MockedTest
->setContent(file_get_contents($fileDir . 'B.config.php')); ->setContent(file_get_contents($fileDir . 'B.config.php'));
$configFileLoader = new ConfigFileLoader($this->root->url()); $configFileLoader = new ConfigFileLoader($this->root->url());
$configCache = new ConfigCache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
@ -245,7 +245,7 @@ class ConfigFileLoaderTest extends MockedTest
->setContent(file_get_contents($fileDir . 'B.ini.php')); ->setContent(file_get_contents($fileDir . 'B.ini.php'));
$configFileLoader = new ConfigFileLoader($this->root->url()); $configFileLoader = new ConfigFileLoader($this->root->url());
$configCache = new ConfigCache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
@ -274,7 +274,7 @@ class ConfigFileLoaderTest extends MockedTest
->setContent(file_get_contents($fileDir . 'B.ini.php')); ->setContent(file_get_contents($fileDir . 'B.ini.php'));
$configFileLoader = new ConfigFileLoader($this->root->url()); $configFileLoader = new ConfigFileLoader($this->root->url());
$configCache = new ConfigCache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);

View file

@ -2,7 +2,7 @@
namespace Friendica\Test\src\Util; namespace Friendica\Test\src\Util;
use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\Config\Cache;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\IConfig;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
use Friendica\Util\Profiler; use Friendica\Util\Profiler;
@ -28,7 +28,7 @@ class ProfilerTest extends MockedTest
*/ */
public function testSetUp() public function testSetUp()
{ {
$configCache = \Mockery::mock(ConfigCache::class); $configCache = \Mockery::mock(Cache::class);
$configCache->shouldReceive('get') $configCache->shouldReceive('get')
->withAnyArgs() ->withAnyArgs()
->andReturn(true) ->andReturn(true)
@ -103,7 +103,7 @@ class ProfilerTest extends MockedTest
*/ */
public function testSaveTimestamp($timestamp, $name, array $functions) public function testSaveTimestamp($timestamp, $name, array $functions)
{ {
$configCache = \Mockery::mock(ConfigCache::class); $configCache = \Mockery::mock(Cache::class);
$configCache->shouldReceive('get') $configCache->shouldReceive('get')
->withAnyArgs() ->withAnyArgs()
->andReturn(true) ->andReturn(true)
@ -124,7 +124,7 @@ class ProfilerTest extends MockedTest
*/ */
public function testReset($timestamp, $name, array $functions) public function testReset($timestamp, $name, array $functions)
{ {
$configCache = \Mockery::mock(ConfigCache::class); $configCache = \Mockery::mock(Cache::class);
$configCache->shouldReceive('get') $configCache->shouldReceive('get')
->withAnyArgs() ->withAnyArgs()
->andReturn(true) ->andReturn(true)
@ -187,7 +187,7 @@ class ProfilerTest extends MockedTest
->shouldReceive('info') ->shouldReceive('info')
->once(); ->once();
$configCache = \Mockery::mock(ConfigCache::class); $configCache = \Mockery::mock(Cache::class);
$configCache->shouldReceive('get') $configCache->shouldReceive('get')
->withAnyArgs() ->withAnyArgs()
->andReturn(true) ->andReturn(true)
@ -218,7 +218,7 @@ class ProfilerTest extends MockedTest
*/ */
public function testEnableDisable() public function testEnableDisable()
{ {
$configCache = \Mockery::mock(ConfigCache::class); $configCache = \Mockery::mock(Cache::class);
$configCache->shouldReceive('get') $configCache->shouldReceive('get')
->with('system', 'profiler') ->with('system', 'profiler')
->andReturn(true) ->andReturn(true)