Browse Source

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

pull/8142/head
nupplaPhil 2 years ago
parent
commit
d5a473abda
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
  1. 2
      index.php
  2. 19
      src/App.php
  3. 8
      src/App/Authentication.php
  4. 4
      src/App/Mode.php
  5. 30
      src/App/Page.php
  6. 10
      src/Console/AutomaticInstallation.php
  7. 6
      src/Console/DatabaseStructure.php
  8. 8
      src/Core/BaseConfig.php
  9. 16
      src/Core/BasePConfig.php
  10. 4
      src/Core/Config/Cache.php
  11. 6
      src/Core/Config/IConfig.php
  12. 4
      src/Core/Config/JitConfig.php
  13. 4
      src/Core/Config/PreloadConfig.php
  14. 12
      src/Core/Installer.php
  15. 4
      src/Core/PConfig/Cache.php
  16. 8
      src/Core/PConfig/IPConfig.php
  17. 9
      src/Core/PConfig/JitPConfig.php
  18. 9
      src/Core/PConfig/PreloadPConfig.php
  19. 4
      src/DI.php
  20. 6
      src/Database/Database.php
  21. 24
      src/Factory/ConfigFactory.php
  22. 6
      src/Model/Notify.php
  23. 2
      src/Module/Admin/Summary.php
  24. 6
      src/Module/Install.php
  25. 14
      src/Util/ConfigFileLoader.php
  26. 6
      src/Util/Profiler.php
  27. 14
      static/dependencies.config.php
  28. 4
      tests/Util/AppMockTrait.php
  29. 6
      tests/functional/DependencyCheckTest.php
  30. 8
      tests/include/ApiTest.php
  31. 4
      tests/src/App/ModeTest.php
  32. 6
      tests/src/Console/AutomaticInstallationConsoleTest.php
  33. 34
      tests/src/Core/Config/Cache/ConfigCacheTest.php
  34. 28
      tests/src/Core/Config/Cache/PConfigCacheTest.php
  35. 26
      tests/src/Core/Config/ConfigurationTest.php
  36. 4
      tests/src/Core/Config/JitPConfigurationTest.php
  37. 32
      tests/src/Core/Config/PConfigurationTest.php
  38. 4
      tests/src/Core/Config/PreloadPConfigurationTest.php
  39. 4
      tests/src/Core/InstallerTest.php
  40. 18
      tests/src/Util/Config/ConfigFileLoaderTest.php
  41. 12
      tests/src/Util/ProfilerTest.php

2
index.php

@ -22,7 +22,7 @@ $a = \Friendica\DI::app();
$a->runFrontend(
$dice->create(\Friendica\App\Module::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\Page::class)
);

19
src/App.php

@ -8,9 +8,9 @@ use Exception;
use Friendica\App\Arguments;
use Friendica\App\BaseURL;
use Friendica\App\Authentication;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Cache;
use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\IPConfiguration;
use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Theme;
@ -118,14 +118,14 @@ class App
private $process;
/**
* @var IPConfiguration
* @var IPConfig
*/
private $pConfig;
/**
* Returns the current config cache of this node
*
* @return ConfigCache
* @return Cache
*/
public function getConfigCache()
{
@ -153,9 +153,9 @@ class App
* @param L10n $l10n The translator instance
* @param App\Arguments $args The Friendica Arguments of the call
* @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->config = $config;
@ -432,13 +432,14 @@ class App
*
* @param App\Module $module The determined module
* @param App\Router $router
* @param IPConfiguration $pconfig
* @param IPConfig $pconfig
* @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 \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();

8
src/App/Authentication.php

@ -9,7 +9,7 @@ namespace Friendica\App;
use Exception;
use Friendica\App;
use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\IPConfiguration;
use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\Hook;
use Friendica\Core\Session;
use Friendica\Core\System;
@ -46,7 +46,7 @@ class Authentication
private $cookie;
/** @var Session\ISession */
private $session;
/** @var IPConfiguration */
/** @var IPConfig */
private $pConfig;
/**
@ -60,9 +60,9 @@ class Authentication
* @param LoggerInterface $logger
* @param User\Cookie $cookie
* @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->mode = $mode;

4
src/App/Mode.php

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

30
src/App/Page.php

@ -8,7 +8,7 @@ use DOMXPath;
use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\IPConfiguration;
use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
@ -168,15 +168,15 @@ class Page implements ArrayAccess
* - Infinite scroll data
* - head.tpl template
*
* @param App $app The Friendica App instance
* @param Module $module The loaded Friendica module
* @param L10n $l10n The l10n language instance
* @param IConfig $config The Friendica configuration
* @param IPConfiguration $pConfig The Friendica personal configuration (for user)
* @param App $app The Friendica App instance
* @param Module $module The loaded Friendica module
* @param L10n $l10n The l10n language instance
* @param IConfig $config The Friendica configuration
* @param IPConfig $pConfig The Friendica personal configuration (for user)
*
* @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);
@ -342,17 +342,17 @@ class Page implements ArrayAccess
/**
* Executes the creation of the current page and prints it to the screen
*
* @param App $app The Friendica App
* @param BaseURL $baseURL The Friendica Base URL
* @param Mode $mode The current node mode
* @param Module $module The loaded Friendica module
* @param L10n $l10n The l10n language class
* @param IConfig $config The Configuration of this node
* @param IPConfiguration $pconfig The personal/user configuration
* @param App $app The Friendica App
* @param BaseURL $baseURL The Friendica Base URL
* @param Mode $mode The current node mode
* @param Module $module The loaded Friendica module
* @param L10n $l10n The l10n language class
* @param IConfig $config The Configuration of this node
* @param IPConfig $pconfig The personal/user configuration
*
* @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();

10
src/Console/AutomaticInstallation.php

@ -20,7 +20,7 @@ class AutomaticInstallation extends Console
*/
private $appMode;
/**
* @var Config\Cache\ConfigCache
* @var \Friendica\Core\Config\Cache
*/
private $configCache;
@ -89,7 +89,7 @@ Examples
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);
@ -241,13 +241,13 @@ HELP;
}
/**
* @param Installer $installer The Installer instance
* @param Config\Cache\ConfigCache $configCache The config cache
* @param Installer $installer The Installer instance
* @param \Friendica\Core\Config\Cache $configCache The config cache
*
* @return bool true if checks were successfully, otherwise false
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private function runBasicChecks(Installer $installer, Config\Cache\ConfigCache $configCache)
private function runBasicChecks(Installer $installer, Config\Cache $configCache)
{
$checked = true;

6
src/Console/DatabaseStructure.php

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

8
src/Core/BaseConfig.php

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

16
src/Core/Config/PConfiguration.php → src/Core/BasePConfig.php

@ -1,7 +1,9 @@
<?php
namespace Friendica\Core\Config;
namespace Friendica\Core;
use Friendica\Core\PConfig\Cache;
use Friendica\Core\PConfig\IPConfig;
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
* increase the performance.
*/
abstract class PConfiguration implements IPConfiguration
abstract class BasePConfig implements IPConfig
{
/**
* @var Cache\PConfigCache
* @var Cache
*/
protected $configCache;
@ -24,10 +26,10 @@ abstract class PConfiguration implements IPConfiguration
protected $configModel;
/**
* @param Cache\PConfigCache $configCache The configuration cache
* @param Model\Config\PConfig $configModel The configuration model
* @param Cache $configCache The configuration cache
* @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->configModel = $configModel;
@ -36,7 +38,7 @@ abstract class PConfiguration implements IPConfiguration
/**
* Returns the Config Cache
*
* @return Cache\PConfigCache
* @return Cache
*/
public function getCache()
{

4
src/Core/Config/Cache/ConfigCache.php → src/Core/Config/Cache.php

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

6
src/Core/Config/IConfig.php

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

4
src/Core/Config/JitConfig.php

@ -20,10 +20,10 @@ class JitConfig extends BaseConfig
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
*/
public function __construct(Cache\ConfigCache $configCache, Model\Config\Config $configModel)
public function __construct(Cache $configCache, Model\Config\Config $configModel)
{
parent::__construct($configCache, $configModel);
$this->db_loaded = [];

4
src/Core/Config/PreloadConfig.php

@ -17,10 +17,10 @@ class PreloadConfig extends BaseConfig
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
*/
public function __construct(Cache\ConfigCache $configCache, Model\Config\Config $configModel)
public function __construct(Cache $configCache, Model\Config\Config $configModel)
{
parent::__construct($configCache, $configModel);
$this->config_loaded = false;

12
src/Core/Installer.php

@ -6,7 +6,7 @@ namespace Friendica\Core;
use DOMDocument;
use Exception;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Cache;
use Friendica\Database\Database;
use Friendica\Database\DBStructure;
use Friendica\DI;
@ -129,12 +129,12 @@ class Installer
* - Creates `config/local.config.php`
* - 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
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function createConfig(ConfigCache $configCache)
public function createConfig(Cache $configCache)
{
$basepath = $configCache->get('system', 'basepath');
@ -618,12 +618,12 @@ class Installer
/**
* Setup the default cache for a new installation
*
* @param ConfigCache $configCache The configuration cache
* @param string $basePath The determined basepath
* @param Cache $configCache The configuration cache
* @param string $basePath The determined basepath
*
* @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('system', 'basepath' , $basePath);

4
src/Core/Config/Cache/PConfigCache.php → src/Core/PConfig/Cache.php

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

8
src/Core/Config/IPConfiguration.php → src/Core/PConfig/IPConfig.php

@ -1,11 +1,11 @@
<?php
namespace Friendica\Core\Config;
namespace Friendica\Core\PConfig;
/**
* 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
*
* @return void
* @see PConfigCache
* @see Cache
*
*/
function load(int $uid, string $cat = 'config');
@ -76,7 +76,7 @@ interface IPConfiguration
/**
* Returns the Config Cache
*
* @return Cache\PConfigCache
* @return Cache
*/
function getCache();
}

9
src/Core/Config/JitPConfiguration.php → src/Core/PConfig/JitPConfig.php

@ -1,7 +1,8 @@
<?php
namespace Friendica\Core\Config;
namespace Friendica\Core\PConfig;
use Friendica\Core\BasePConfig;
use Friendica\Model;
/**
@ -11,7 +12,7 @@ use Friendica\Model;
* Default Configuration type.
* 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)
@ -19,10 +20,10 @@ class JitPConfiguration extends PConfiguration
private $db_loaded;
/**
* @param Cache\PConfigCache $configCache The configuration cache
* @param Cache $configCache The configuration cache
* @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);
$this->db_loaded = [];

9
src/Core/Config/PreloadPConfiguration.php → src/Core/PConfig/PreloadPConfig.php

@ -1,7 +1,8 @@
<?php
namespace Friendica\Core\Config;
namespace Friendica\Core\PConfig;
use Friendica\Core\BasePConfig;
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.
*/
class PreloadPConfiguration extends PConfiguration
class PreloadPConfig extends BasePConfig
{
/** @var array */
private $config_loaded;
/**
* @param Cache\PConfigCache $configCache The configuration cache
* @param Cache $configCache The configuration cache
* @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);
$this->config_loaded = [];

4
src/DI.php

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

6
src/Database/Database.php

@ -2,7 +2,7 @@
namespace Friendica\Database;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Cache;
use Friendica\Core\System;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\DateTimeFormat;
@ -25,7 +25,7 @@ class Database
protected $connected = false;
/**
* @var ConfigCache
* @var Cache
*/
protected $configCache;
/**
@ -47,7 +47,7 @@ class Database
protected $in_retrial = false;
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
$this->configCache = $configCache;

24
src/Factory/ConfigFactory.php

@ -13,23 +13,23 @@ class ConfigFactory
/**
* @param ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig)
*
* @return Cache\ConfigCache
* @return Cache
*/
public function createCache(ConfigFileLoader $loader)
{
$configCache = new Cache\ConfigCache();
$configCache = new Cache();
$loader->setupCache($configCache);
return $configCache;
}
/**
* @param Cache\ConfigCache $configCache The config cache of this adapter
* @param ConfigModel $configModel The configuration model
* @param Cache $configCache The config cache of this adapter
* @param ConfigModel $configModel The configuration model
*
* @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') {
$configuration = new Config\PreloadConfig($configCache, $configModel);
@ -42,18 +42,18 @@ class ConfigFactory
}
/**
* @param Cache\ConfigCache $configCache The config cache
* @param Cache\PConfigCache $pConfigCache The personal config cache
* @param PConfigModel $configModel The configuration model
* @param Cache $configCache The config cache
* @param \Friendica\Core\PConfig\Cache $pConfigCache The personal config cache
* @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') {
$configuration = new Config\PreloadPConfiguration($pConfigCache, $configModel);
$configuration = new \Friendica\Core\PConfig\PreloadPConfig($pConfigCache, $configModel);
} else {
$configuration = new Config\JitPConfiguration($pConfigCache, $configModel);
$configuration = new \Friendica\Core\PConfig\JitPConfig($pConfigCache, $configModel);
}
return $configuration;

6
src/Model/Notify.php

@ -6,7 +6,7 @@ use Exception;
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Config\IPConfiguration;
use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\System;
@ -71,13 +71,13 @@ final class Notify
private $args;
/** @var App\BaseURL */
private $baseUrl;
/** @var IPConfiguration */
/** @var IPConfig */
private $pConfig;
/** @var LoggerInterface */
private $logger;
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->l10n = $l10n;

2
src/Module/Admin/Summary.php

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

6
src/Module/Install.php

@ -5,7 +5,7 @@ namespace Friendica\Module;
use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Cache;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Network\HTTPException;
@ -332,13 +332,13 @@ class Install extends BaseModule
/**
* 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 string $cat The category of the setting
* @param string $key The key of the setting
* @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,
Strings::escapeTags(

14
src/Util/ConfigFileLoader.php

@ -4,10 +4,10 @@ namespace Friendica\Util;
use Exception;
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:
* - *.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
* expected local.config.php
*
* @param ConfigCache $config The config cache to load to
* @param bool $raw Setup the raw config format
* @param Cache $config The config cache to load to
* @param bool $raw Setup the raw config format
*
* @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
$config->load($this->loadStaticConfig('defaults'));
@ -128,13 +128,13 @@ class ConfigFileLoader
/**
* 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)
*
* @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
foreach ($this->getConfigFiles(true) as $configFile) {

6
src/Util/Profiler.php

@ -2,7 +2,7 @@
namespace Friendica\Util;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Cache;
use Friendica\Core\Config\IConfig;
use Psr\Container\ContainerExceptionInterface;
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->rendertime = $configCache->get('rendertime', 'callstack');

14
static/dependencies.config.php

@ -48,43 +48,43 @@ return [
$_SERVER
]
],
Util\BasePath::class => [
Util\BasePath::class => [
'constructParams' => [
dirname(__FILE__, 2),
$_SERVER
]
],
Util\ConfigFileLoader::class => [
Util\ConfigFileLoader::class => [
'shared' => true,
'constructParams' => [
[Dice::INSTANCE => '$basepath'],
],
],
Config\Cache\ConfigCache::class => [
Config\Cache::class => [
'instanceOf' => Factory\ConfigFactory::class,
'call' => [
['createCache', [], Dice::CHAIN_CALL],
],
],
App\Mode::class => [
App\Mode::class => [
'call' => [
['determineRunMode', [true, $_SERVER], Dice::CHAIN_CALL],
['determine', [], Dice::CHAIN_CALL],
],
],
Config\IConfig::class => [
Config\IConfig::class => [
'instanceOf' => Factory\ConfigFactory::class,
'call' => [
['createConfig', [], Dice::CHAIN_CALL],
],
],
Config\IPConfiguration::class => [
\Friendica\Core\PConfig\IPConfig::class => [
'instanceOf' => Factory\ConfigFactory::class,
'call' => [
['createPConfig', [], Dice::CHAIN_CALL],
]
],
Database::class => [
Database::class => [
'constructParams' => [
[Dice::INSTANCE => \Psr\Log\NullLogger::class],
$_SERVER,

4
tests/Util/AppMockTrait.php

@ -52,9 +52,9 @@ trait AppMockTrait
$this->dice = \Mockery::mock(Dice::class)->makePartial();
$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')
->with(Config\Cache\ConfigCache::class)
->with(Config\Cache::class)
->andReturn($this->configMock);
$this->mode = \Mockery::mock(App\Mode::class);
$this->dice->shouldReceive('create')

6
tests/functional/DependencyCheckTest.php

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

8
tests/include/ApiTest.php

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

4
tests/src/App/ModeTest.php

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

6
tests/src/Console/AutomaticInstallationConsoleTest.php

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

34
tests/src/Core/Config/Cache/ConfigCacheTest.php

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

28
tests/src/Core/Config/Cache/PConfigCacheTest.php

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

26
tests/src/Core/Config/ConfigurationTest.php

@ -2,7 +2,7 @@
namespace Friendica\Test\src\Core\Config;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Cache;
use Friendica\Core\Config\IConfig;
use Friendica\Model\Config\Config as ConfigModel;
use Friendica\Test\MockedTest;
@ -14,7 +14,7 @@ abstract class ConfigurationTest extends MockedTest
/** @var ConfigModel|MockInterface */
protected $configModel;
/** @var ConfigCache */
/** @var Cache */
protected $configCache;
/** @var IConfig */
@ -42,7 +42,7 @@ abstract class ConfigurationTest extends MockedTest
// Create the config model
$this->configModel = Mockery::mock(ConfigModel::class);
$this->configCache = new ConfigCache();
$this->configCache = new Cache();
}
/**
@ -142,7 +142,7 @@ abstract class ConfigurationTest extends MockedTest
->once();
$this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache());
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// assert config is loaded everytime
$this->assertConfig('config', $data['config']);
@ -154,7 +154,7 @@ abstract class ConfigurationTest extends MockedTest
public function testLoad(array $data, array $possibleCats, array $load)
{
$this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache());
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($load as $loadedCats) {
$this->testedConfig->load($loadedCats);
@ -235,7 +235,7 @@ abstract class ConfigurationTest extends MockedTest
public function testCacheLoadDouble(array $data1, array $data2, array $expect)
{
$this->testedConfig = $this->getInstance();
$this->assertInstanceOf(ConfigCache::class, $this->testedConfig->getCache());
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($data1 as $cat => $data) {
$this->testedConfig->load($cat);
@ -260,7 +260,7 @@ abstract class ConfigurationTest extends MockedTest
$this->configModel->shouldReceive('load')->withAnyArgs()->andReturn([])->once();
$this->testedConfig = $this->getInstance();