*/
use Friendica\App;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
use Friendica\Factory;
use Friendica\Util\BasePath;
use Friendica\Util\ExAuth;
require dirname(__DIR__) . '/vendor/autoload.php';
$basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('auth_ejabberd', $config);
$profiler = Factory\ProfilerFactory::create($logger, $config);
require dirname(__DIR__) . '/vendor/autoload.php';
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
use Friendica\Factory;
use Friendica\Util\BasePath;
$basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('console', $config);
$profiler = Factory\ProfilerFactory::create($logger, $config);
use Friendica\App;
use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Factory;
require dirname(__DIR__) . '/vendor/autoload.php';
$basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('daemon', $config);
$profiler = Factory\ProfilerFactory::create($logger, $config);
file_put_contents($pidfile, $pid);
// We lose the database connection upon forking
- $a->loadDatabase();
+ Factory\DBFactory::init($configCache, $_SERVER);
}
Config::set('system', 'worker_daemon_mode', true);
use Friendica\App;
use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
use Friendica\Core\Update;
use Friendica\Core\Worker;
use Friendica\Factory;
require dirname(__DIR__) . '/vendor/autoload.php';
$basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('worker', $config);
$profiler = Factory\ProfilerFactory::create($logger, $config);
*/
use Friendica\App;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
use Friendica\Factory;
use Friendica\Util\BasePath;
require __DIR__ . '/vendor/autoload.php';
$basedir = BasePath::create(__DIR__, $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('index', $config);
$profiler = Factory\ProfilerFactory::create($logger, $config);
use DOMDocument;
use DOMXPath;
use Exception;
-use Friendica\Core\Config\ConfigCache;
-use Friendica\Core\Config\ConfigCacheLoader;
+use Friendica\Core\Config\Cache\ConfigCacheLoader;
+use Friendica\Core\Config\Cache\IConfigCache;
+use Friendica\Core\Config\Configuration;
use Friendica\Database\DBA;
use Friendica\Factory\ConfigFactory;
use Friendica\Network\HTTPException\InternalServerErrorException;
private $logger;
/**
- * @var ConfigCache The cached config
+ * @var Configuration The config
*/
private $config;
/**
* Returns the current config cache of this node
*
- * @return ConfigCache
+ * @return IConfigCache
*/
- public function getConfig()
+ public function getConfigCache()
{
- return $this->config;
+ return $this->config->getCache();
}
/**
/**
* @brief App constructor.
*
- * @param ConfigCache $config The Cached Config
+ * @param Configuration $config The Configuration
* @param LoggerInterface $logger Logger of this application
* @param Profiler $profiler The profiler of this application
* @param bool $isBackend Whether it is used for backend or frontend (Default true=backend)
*
* @throws Exception if the Basepath is not usable
*/
- public function __construct(ConfigCache $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
+ public function __construct(Configuration $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
{
$this->config = $config;
$this->logger = $logger;
*/
public function reload()
{
- Core\Config::init($this->config);
- Core\PConfig::init($this->config);
-
- $this->loadDatabase();
-
$this->getMode()->determine($this->basePath);
$this->determineURLPath();
if ($this->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
- $adapterType = $this->config->get('system', 'config_adapter');
- $adapter = ConfigFactory::createConfig($adapterType, $this->config);
- Core\Config::setAdapter($adapter);
- $adapterP = ConfigFactory::createPConfig($adapterType, $this->config);
- Core\PConfig::setAdapter($adapterP);
Core\Config::load();
}
Core\Hook::loadHooks();
$loader = new ConfigCacheLoader($this->basePath);
Core\Hook::callAll('load_config', $loader);
- $this->config->loadConfigArray($loader->loadCoreConfig('addon'), true);
+ $this->config->getCache()->load($loader->loadCoreConfig('addon'), true);
}
$this->loadDefaultTimezone();
}
}
- public function loadDatabase()
- {
- if (DBA::connected()) {
- return;
- }
-
- $db_host = $this->config->get('database', 'hostname');
- $db_user = $this->config->get('database', 'username');
- $db_pass = $this->config->get('database', 'password');
- $db_data = $this->config->get('database', 'database');
- $charset = $this->config->get('database', 'charset');
-
- // Use environment variables for mysql if they are set beforehand
- if (!empty(getenv('MYSQL_HOST'))
- && !empty(getenv('MYSQL_USERNAME') || !empty(getenv('MYSQL_USER')))
- && getenv('MYSQL_PASSWORD') !== false
- && !empty(getenv('MYSQL_DATABASE')))
- {
- $db_host = getenv('MYSQL_HOST');
- if (!empty(getenv('MYSQL_PORT'))) {
- $db_host .= ':' . getenv('MYSQL_PORT');
- }
- if (!empty(getenv('MYSQL_USERNAME'))) {
- $db_user = getenv('MYSQL_USERNAME');
- } else {
- $db_user = getenv('MYSQL_USER');
- }
- $db_pass = (string) getenv('MYSQL_PASSWORD');
- $db_data = getenv('MYSQL_DATABASE');
- }
-
- $stamp1 = microtime(true);
-
- if (DBA::connect($this->config, $this->profiler, $db_host, $db_user, $db_pass, $db_data, $charset)) {
- // Loads DB_UPDATE_VERSION constant
- Database\DBStructure::definition($this->basePath, false);
- }
-
- unset($db_host, $db_user, $db_pass, $db_data, $charset);
-
- $this->profiler->saveTimestamp($stamp1, 'network', Core\System::callstack());
- }
-
public function getScheme()
{
return $this->scheme;
class Config
{
/**
- * @var Config\IConfigAdapter|null
+ * @var Config\Configuration
*/
- private static $adapter;
+ private static $config;
/**
- * @var Config\IConfigCache
- */
- private static $cache;
-
- /**
- * Initialize the config with only the cache
- *
- * @param Config\IConfigCache $cache The configuration cache
- */
- public static function init(Config\IConfigCache $cache)
- {
- self::$cache = $cache;
- }
-
- /**
- * Add the adapter for DB-backend
+ * Initialize the config
*
- * @param Config\IConfigAdapter $adapter
+ * @param Config\Configuration $config
*/
- public static function setAdapter(Config\IConfigAdapter $adapter)
+ public static function init(Config\Configuration $config)
{
- self::$adapter = $adapter;
+ self::$config = $config;
}
/**
* @brief Loads all configuration values of family into a cached storage.
*
- * All configuration values of the system are stored in the cache ( @see IConfigCache )
- *
- * @param string $family The category of the configuration value
+ * @param string $cat The category of the configuration value
*
* @return void
*/
- public static function load($family = "config")
+ public static function load($cat = "config")
{
- if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
- return;
- }
-
- self::$adapter->load($family);
+ self::$config->load($cat);
}
/**
* @brief Get a particular user's config variable given the category name
* ($family) and a key.
*
- * Get a particular config value from the given category ($family)
- * and the $key from a cached storage either from the self::$adapter
- * (@see IConfigAdapter ) or from the static::$cache (@see IConfigCache ).
- *
- * @param string $family The category of the configuration value
+ * @param string $cat The category of the configuration value
* @param string $key The configuration key to query
* @param mixed $default_value optional, The value to return if key is not set (default: null)
* @param boolean $refresh optional, If true the config is loaded from the db and not from the cache (default: false)
*
* @return mixed Stored value or null if it does not exist
*/
- public static function get($family, $key, $default_value = null, $refresh = false)
+ public static function get($cat, $key, $default_value = null, $refresh = false)
{
- if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
- return self::$cache->get($family, $key, $default_value);
- }
-
- return self::$adapter->get($family, $key, $default_value, $refresh);
+ return self::$config->get($cat, $key, $default_value, $refresh);
}
/**
* @brief Sets a configuration value for system config
*
- * Stores a config value ($value) in the category ($family) under the key ($key)
+ * Stores a config value ($value) in the category ($cat) under the key ($key)
*
* Note: Please do not store booleans - convert to 0/1 integer values!
*
- * @param string $family The category of the configuration value
+ * @param string $cat The category of the configuration value
* @param string $key The configuration key to set
* @param mixed $value The value to store
*
* @return bool Operation success
*/
- public static function set($family, $key, $value)
+ public static function set($cat, $key, $value)
{
- if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
- return self::$cache->set($family, $key, $value);
- }
-
- return self::$adapter->set($family, $key, $value);
+ return self::$config->set($cat, $key, $value);
}
/**
* @brief Deletes the given key from the system configuration.
*
- * Removes the configured value from the stored cache in self::$config
- * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter ).
- *
- * @param string $family The category of the configuration value
+ * @param string $cat The category of the configuration value
* @param string $key The configuration key to delete
*
- * @return mixed
+ * @return bool
*/
- public static function delete($family, $key)
+ public static function delete($cat, $key)
{
- if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
- self::$cache->delete($family, $key);
- }
-
- return self::$adapter->delete($family, $key);
+ return self::$config->delete($cat, $key);
}
}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Config;
-
-abstract class AbstractDbaConfigAdapter
-{
- /** @var bool */
- protected $connected = true;
-
- public function isConnected()
- {
- return $this->connected;
- }
-}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
+
+abstract class AbstractDbaConfigAdapter
+{
+ /** @var bool */
+ protected $connected = true;
+
+ public function __construct()
+ {
+ $this->connected = DBA::connected();
+ }
+
+ public function isConnected()
+ {
+ return $this->connected;
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config\Adapter;
+
+/**
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+interface IConfigAdapter
+{
+ /**
+ * Loads all configuration values into a cached storage.
+ *
+ * @param string $cat The category of the configuration values to load
+ *
+ * @return array
+ */
+ public function load($cat = "config");
+
+ /**
+ * Get a particular user's config variable given the category name
+ * ($family) and a key.
+ *
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to query
+ *
+ * @return mixed Stored value or "!<unset>!" if it does not exist
+ */
+ public function get($cat, $key);
+
+ /**
+ * Stores a config value ($value) in the category ($family) under the key ($key)
+ * for the user_id $uid.
+ *
+ * Note: Please do not store booleans - convert to 0/1 integer values!
+ *
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to set
+ * @param mixed $value The value to store
+ *
+ * @return bool Operation success
+ */
+ public function set($cat, $key, $value);
+
+ /**
+ * Removes the configured value from the stored cache
+ * and removes it from the database.
+ *
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to delete
+ *
+ * @return mixed
+ */
+ public function delete($cat, $key);
+
+ /**
+ * Checks, if the current adapter is connected to the backend
+ *
+ * @return bool
+ */
+ public function isConnected();
+}
--- /dev/null
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace Friendica\Core\Config\Adapter;
+
+/**
+ *
+ * @author benlo
+ */
+interface IPConfigAdapter
+{
+ /**
+ * Loads all configuration values of a user's config family into a cached storage.
+ *
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
+ *
+ * @return array
+ */
+ public function load($uid, $cat);
+
+ /**
+ * Get a particular user's config variable given the category name
+ * ($family) and a key.
+ *
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to query
+ *
+ * @return mixed Stored value or "!<unset>!" if it does not exist
+ */
+ public function get($uid, $cat, $key);
+
+ /**
+ * Stores a config value ($value) in the category ($family) under the key ($key)
+ * for the user_id $uid.
+ *
+ * @note Please do not store booleans - convert to 0/1 integer values!
+ *
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to set
+ * @param string $value The value to store
+ *
+ * @return bool Operation success
+ */
+ public function set($uid, $cat, $key, $value);
+
+ /**
+ * Removes the configured value from the stored cache
+ * and removes it from the database.
+ *
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to delete
+ *
+ * @return bool
+ */
+ public function delete($uid, $cat, $key);
+
+ /**
+ * Checks, if the current adapter is connected to the backend
+ *
+ * @return bool
+ */
+ public function isConnected();
+}
--- /dev/null
+<?php
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
+
+/**
+ * JustInTime Configuration Adapter
+ *
+ * Default Config Adapter. Provides the best performance for pages loading few configuration variables.
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapter
+{
+ private $in_db;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function load($cat = "config")
+ {
+ $return = [];
+
+ if (!$this->isConnected()) {
+ return $return;
+ }
+
+ // We don't preload "system" anymore.
+ // This reduces the number of database reads a lot.
+ if ($cat === 'system') {
+ return $return;
+ }
+
+ $configs = DBA::select('config', ['v', 'k'], ['cat' => $cat]);
+ while ($config = DBA::fetch($configs)) {
+ $key = $config['k'];
+
+ $return[$key] = $config['v'];
+ $this->in_db[$cat][$key] = true;
+ }
+ DBA::close($configs);
+
+ return [$cat => $config];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get($cat, $key)
+ {
+ if (!$this->isConnected()) {
+ return '!<unset>!';
+ }
+
+ $config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
+ if (DBA::isResult($config)) {
+ // manage array value
+ $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
+
+ $this->in_db[$cat][$key] = true;
+ return $value;
+ } else {
+
+ $this->in_db[$cat][$key] = false;
+ return '!<unset>!';
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function set($cat, $key, $value)
+ {
+ if (!$this->isConnected()) {
+ return false;
+ }
+
+ // We store our setting values in a string variable.
+ // So we have to do the conversion here so that the compare below works.
+ // The exception are array values.
+ $dbvalue = (!is_array($value) ? (string)$value : $value);
+
+ $stored = $this->get($cat, $key);
+
+ if (!isset($this->in_db[$cat])) {
+ $this->in_db[$cat] = [];
+ }
+ if (!isset($this->in_db[$cat][$key])) {
+ $this->in_db[$cat][$key] = false;
+ }
+
+ if (($stored === $dbvalue) && $this->in_db[$cat][$key]) {
+ return true;
+ }
+
+ // manage array value
+ $dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
+
+ $result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
+
+ $this->in_db[$cat][$key] = $result;
+
+ return $result;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function delete($cat, $key)
+ {
+ if (!$this->isConnected()) {
+ return false;
+ }
+
+ if (isset($this->cache[$cat][$key])) {
+ unset($this->in_db[$cat][$key]);
+ }
+
+ $result = DBA::delete('config', ['cat' => $cat, 'k' => $key]);
+
+ return $result;
+ }
+}
--- /dev/null
+<?php
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
+
+/**
+ * JustInTime User Configuration Adapter
+ *
+ * Default PConfig Adapter. Provides the best performance for pages loading few configuration variables.
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdapter
+{
+ private $in_db;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function load($uid, $cat)
+ {
+ $return = [];
+
+ if (!$this->isConnected()) {
+ return $return;
+ }
+
+ $pconfigs = DBA::select('pconfig', ['v', 'k'], ['cat' => $cat, 'uid' => $uid]);
+ if (DBA::isResult($pconfigs)) {
+ while ($pconfig = DBA::fetch($pconfigs)) {
+ $key = $pconfig['k'];
+
+ $return[$key] = $pconfig['v'];
+
+ $this->in_db[$uid][$cat][$key] = true;
+ }
+ } else if ($cat != 'config') {
+ // Negative caching
+ $return[null] = "!<unset>!";
+ }
+ DBA::close($pconfigs);
+
+ return [$cat => $return];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get($uid, $cat, $key)
+ {
+ if (!$this->isConnected()) {
+ return null;
+ }
+
+ $pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+ if (DBA::isResult($pconfig)) {
+ // manage array value
+ $value = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
+
+ $this->in_db[$uid][$cat][$key] = true;
+ return $value;
+ } else {
+
+ $this->in_db[$uid][$cat][$key] = false;
+ return '!<unset>!';
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function set($uid, $cat, $key, $value)
+ {
+ if (!$this->isConnected()) {
+ return false;
+ }
+
+ // We store our setting values in a string variable.
+ // So we have to do the conversion here so that the compare below works.
+ // The exception are array values.
+ $dbvalue = (!is_array($value) ? (string)$value : $value);
+
+ $stored = $this->get($uid, $cat, $key);
+
+ if (!isset($this->in_db[$uid])) {
+ $this->in_db[$uid] = [];
+ }
+ if (!isset($this->in_db[$uid][$cat])) {
+ $this->in_db[$uid][$cat] = [];
+ }
+ if (!isset($this->in_db[$uid][$cat][$key])) {
+ $this->in_db[$uid][$cat][$key] = false;
+ }
+
+ if (($stored === $dbvalue) && $this->in_db[$uid][$cat][$key]) {
+ return true;
+ }
+
+ // manage array value
+ $dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
+
+ $result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
+
+ $this->in_db[$uid][$cat][$key] = $result;
+
+ return $result;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function delete($uid, $cat, $key)
+ {
+ if (!$this->isConnected()) {
+ return false;
+ }
+
+ if (!empty($this->in_db[$uid][$cat][$key])) {
+ unset($this->in_db[$uid][$cat][$key]);
+ }
+
+ $result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+
+ return $result;
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
+
+/**
+ * Preload Configuration Adapter
+ *
+ * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapter
+{
+ private $config_loaded = false;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function load($cat = 'config')
+ {
+ $return = [];
+
+ if (!$this->isConnected()) {
+ return $return;
+ }
+
+ if ($this->config_loaded) {
+ return $return;
+ }
+
+ $configs = DBA::select('config', ['cat', 'v', 'k']);
+ while ($config = DBA::fetch($configs)) {
+ $return[$config['k']] = $config['v'];
+ }
+ DBA::close($configs);
+
+ $this->config_loaded = true;
+
+ return [$cat => $return];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get($cat, $key)
+ {
+ if (!$this->isConnected()) {
+ return null;
+ }
+
+ $config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
+ if (DBA::isResult($config)) {
+ // manage array value
+ $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
+
+ return $value;
+ } else {
+
+ return '!<unset>!';
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function set($cat, $key, $value)
+ {
+ if (!$this->isConnected()) {
+ return false;
+ }
+
+ // We store our setting values as strings.
+ // So we have to do the conversion here so that the compare below works.
+ // The exception are array values.
+ $compare_value = !is_array($value) ? (string)$value : $value;
+
+ if ($this->get($cat, $key) === $compare_value) {
+ return true;
+ }
+
+ // manage array value
+ $dbvalue = is_array($value) ? serialize($value) : $value;
+
+ $result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
+
+ return $result;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function delete($cat, $key)
+ {
+ if (!$this->isConnected()) {
+ return false;
+ }
+
+ $result = DBA::delete('config', ['cat' => $cat, 'k' => $key]);
+
+ return $result;
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
+
+/**
+ * Preload User Configuration Adapter
+ *
+ * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdapter
+{
+ private $config_loaded = false;
+
+ /**
+ * @param int $uid The UID of the current user
+ */
+ public function __construct($uid = null)
+ {
+ parent::__construct();
+
+ if (isset($uid)) {
+ $this->load($uid, 'config');
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function load($uid, $cat)
+ {
+ $return = [];
+
+ if ($this->config_loaded) {
+ return $return;
+ }
+
+ if (empty($uid)) {
+ return $return;
+ }
+
+ $pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
+ while ($pconfig = DBA::fetch($pconfigs)) {
+ $return[$pconfig['k']] = $pconfig['v'];
+ }
+ DBA::close($pconfigs);
+
+ $this->config_loaded = true;
+
+ return [$cat => $return];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get($uid, $cat, $key)
+ {
+ if (!$this->isConnected()) {
+ return null;
+ }
+
+ if (!$this->config_loaded) {
+ $this->load($uid, $cat);
+ }
+
+ $config = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+ if (DBA::isResult($config)) {
+ // manage array value
+ $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
+
+ return $value;
+ } else {
+ return '!<unset>!';
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function set($uid, $cat, $key, $value)
+ {
+ if (!$this->isConnected()) {
+ return false;
+ }
+
+ if (!$this->config_loaded) {
+ $this->load($uid, $cat);
+ }
+ // We store our setting values as strings.
+ // So we have to do the conversion here so that the compare below works.
+ // The exception are array values.
+ $compare_value = !is_array($value) ? (string)$value : $value;
+
+ if ($this->get($uid, $cat, $key) === $compare_value) {
+ return true;
+ }
+
+ // manage array value
+ $dbvalue = is_array($value) ? serialize($value) : $value;
+
+ $result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
+
+ return $result;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function delete($uid, $cat, $key)
+ {
+ if (!$this->isConnected()) {
+ return false;
+ }
+
+ if (!$this->config_loaded) {
+ $this->load($uid, $cat);
+ }
+
+ $result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+
+ return $result;
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config\Cache;
+
+/**
+ * The Friendica config cache for the application
+ * Initial, all *.config.php files are loaded into this cache with the
+ * ConfigCacheLoader ( @see ConfigCacheLoader )
+ *
+ * Is used for further caching operations too (depending on the ConfigAdapter )
+ */
+class ConfigCache implements IConfigCache, IPConfigCache
+{
+ /**
+ * @var array
+ */
+ private $config;
+
+ /**
+ * @param array $config A initial config array
+ */
+ public function __construct(array $config = [])
+ {
+ $this->load($config);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function load(array $config, $overwrite = false)
+ {
+ $categories = array_keys($config);
+
+ foreach ($categories as $category) {
+ if (isset($config[$category]) && is_array($config[$category])) {
+ $keys = array_keys($config[$category]);
+
+ foreach ($keys as $key) {
+ if (isset($config[$category][$key])) {
+ if ($overwrite) {
+ $this->set($category, $key, $config[$category][$key]);
+ } else {
+ $this->setDefault($category, $key, $config[$category][$key]);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get($cat, $key = null)
+ {
+ if (isset($this->config[$cat][$key])) {
+ return $this->config[$cat][$key];
+ } else {
+ return '!<unset>!';
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function has($cat, $key = null)
+ {
+ return isset($this->config[$cat][$key])
+ && $this->config[$cat][$key] !== '!<unset>!';
+ }
+
+ /**
+ * Sets a default value in the config cache. Ignores already existing keys.
+ *
+ * @param string $cat Config category
+ * @param string $k Config key
+ * @param mixed $v Default value to set
+ */
+ private function setDefault($cat, $k, $v)
+ {
+ if (!isset($this->config[$cat][$k])) {
+ $this->set($cat, $k, $v);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function set($cat, $key, $value)
+ {
+ // Only arrays are serialized in database, so we have to unserialize sparingly
+ $value = is_string($value) && preg_match("|^a:[0-9]+:{.*}$|s", $value) ? unserialize($value) : $value;
+
+ if (!isset($this->config[$cat])) {
+ $this->config[$cat] = [];
+ }
+
+ $this->config[$cat][$key] = $value;
+
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function hasP($uid, $cat, $key = null)
+ {
+ return isset($this->config[$uid][$cat][$key])
+ && $this->config[$uid][$cat][$key] !== '!<unset>!';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function delete($cat, $key)
+ {
+ if (isset($this->config[$cat][$key])) {
+ unset($this->config[$cat][$key]);
+ if (count($this->config[$cat]) == 0) {
+ unset($this->config[$cat]);
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function loadP($uid, array $config)
+ {
+ foreach ($config as $category => $values) {
+ foreach ($values as $key => $value) {
+ $this->setP($uid, $category, $key, $value);
+ }
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getP($uid, $cat, $key = null)
+ {
+ if (isset($this->config[$uid][$cat][$key])) {
+ return $this->config[$uid][$cat][$key];
+ } else {
+ return '!<unset>!';
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setP($uid, $cat, $key, $value)
+ {
+ // Only arrays are serialized in database, so we have to unserialize sparingly
+ $value = is_string($value) && preg_match("|^a:[0-9]+:{.*}$|s", $value) ? unserialize($value) : $value;
+
+ if (!isset($this->config[$uid]) || !is_array($this->config[$uid])) {
+ $this->config[$uid] = [];
+ }
+
+ if (!isset($this->config[$uid][$cat])) {
+ $this->config[$uid][$cat] = [];
+ }
+
+ $this->config[$uid][$cat][$key] = $value;
+
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function deleteP($uid, $cat, $key)
+ {
+ if (isset($this->config[$uid][$cat][$key])) {
+ unset($this->config[$uid][$cat][$key]);
+ if (count($this->config[$uid][$cat]) == 0) {
+ unset($this->config[$uid][$cat]);
+ if (count($this->config[$uid]) == 0) {
+ unset($this->config[$uid]);
+ }
+ }
+
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Returns the whole configuration
+ *
+ * @return array The configuration
+ */
+ public function getAll()
+ {
+ return $this->config;
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config\Cache;
+
+use Friendica\Core\Addon;
+
+/**
+ * The ConfigCacheLoader loads config-files and stores them in a ConfigCache ( @see ConfigCache )
+ *
+ * It is capable of loading the following config files:
+ * - *.config.php (current)
+ * - *.ini.php (deprecated)
+ * - *.htconfig.php (deprecated)
+ */
+class ConfigCacheLoader
+{
+ /**
+ * The Sub directory of the config-files
+ * @var string
+ */
+ const SUBDIRECTORY = 'config';
+
+ private $baseDir;
+ private $configDir;
+
+ public function __construct($baseDir)
+ {
+ $this->baseDir = $baseDir;
+ $this->configDir = $baseDir . DIRECTORY_SEPARATOR . self::SUBDIRECTORY;
+ }
+
+ /**
+ * Load the configuration files
+ *
+ * First loads the default value for all the configuration keys, then the legacy configuration files, then the
+ * expected local.config.php
+ */
+ public function loadConfigFiles(ConfigCache $config)
+ {
+ // Setting at least the basepath we know
+ $config->set('system', 'basepath', $this->baseDir);
+
+ $config->load($this->loadCoreConfig('defaults'));
+ $config->load($this->loadCoreConfig('settings'));
+
+ $config->load($this->loadLegacyConfig('htpreconfig'), true);
+ $config->load($this->loadLegacyConfig('htconfig'), true);
+
+ $config->load($this->loadCoreConfig('local'), true);
+ }
+
+ /**
+ * Tries to load the specified core-configuration and returns the config array.
+ *
+ * @param string $name The name of the configuration
+ *
+ * @return array The config array (empty if no config found)
+ *
+ * @throws \Exception if the configuration file isn't readable
+ */
+ public function loadCoreConfig($name)
+ {
+ if (file_exists($this->configDir . DIRECTORY_SEPARATOR . $name . '.config.php')) {
+ return $this->loadConfigFile($this->configDir . DIRECTORY_SEPARATOR . $name . '.config.php');
+ } elseif (file_exists($this->configDir . DIRECTORY_SEPARATOR . $name . '.ini.php')) {
+ return $this->loadINIConfigFile($this->configDir . DIRECTORY_SEPARATOR . $name . '.ini.php');
+ } else {
+ return [];
+ }
+ }
+
+ /**
+ * Tries to load the specified addon-configuration and returns the config array.
+ *
+ * @param string $name The name of the configuration
+ *
+ * @return array The config array (empty if no config found)
+ *
+ * @throws \Exception if the configuration file isn't readable
+ */
+ public function loadAddonConfig($name)
+ {
+ $filepath = $this->baseDir . DIRECTORY_SEPARATOR . // /var/www/html/
+ Addon::DIRECTORY . DIRECTORY_SEPARATOR . // addon/
+ $name . DIRECTORY_SEPARATOR . // openstreetmap/
+ self::SUBDIRECTORY . DIRECTORY_SEPARATOR . // config/
+ $name . ".config.php"; // openstreetmap.config.php
+
+ if (file_exists($filepath)) {
+ return $this->loadConfigFile($filepath);
+ } else {
+ return [];
+ }
+ }
+
+ /**
+ * Tries to load the legacy config files (.htconfig.php, .htpreconfig.php) and returns the config array.
+ *
+ * @param string $name The name of the config file
+ *
+ * @return array The configuration array (empty if no config found)
+ *
+ * @deprecated since version 2018.09
+ */
+ private function loadLegacyConfig($name)
+ {
+ $filePath = $this->baseDir . DIRECTORY_SEPARATOR . '.' . $name . '.php';
+
+ if (file_exists($filePath)) {
+ $a = new \stdClass();
+ $a->config = [];
+ include $filePath;
+
+ if (isset($db_host)) {
+ $a->config['database']['hostname'] = $db_host;
+ unset($db_host);
+ }
+ if (isset($db_user)) {
+ $a->config['database']['username'] = $db_user;
+ unset($db_user);
+ }
+ if (isset($db_pass)) {
+ $a->config['database']['password'] = $db_pass;
+ unset($db_pass);
+ }
+ if (isset($db_data)) {
+ $a->config['database']['database'] = $db_data;
+ unset($db_data);
+ }
+ if (isset($a->config['system']['db_charset'])) {
+ $a->config['database']['charset'] = $a->config['system']['charset'];
+ }
+ if (isset($pidfile)) {
+ $a->config['system']['pidfile'] = $pidfile;
+ unset($pidfile);
+ }
+ if (isset($default_timezone)) {
+ $a->config['system']['default_timezone'] = $default_timezone;
+ unset($default_timezone);
+ }
+ if (isset($lang)) {
+ $a->config['system']['language'] = $lang;
+ unset($lang);
+ }
+
+ return $a->config;
+ } else {
+ return [];
+ }
+ }
+
+ /**
+ * Tries to load the specified legacy configuration file and returns the config array.
+ *
+ * @deprecated since version 2018.12
+ * @param string $filepath
+ *
+ * @return array The configuration array
+ * @throws \Exception
+ */
+ private function loadINIConfigFile($filepath)
+ {
+ $contents = include($filepath);
+
+ $config = parse_ini_string($contents, true, INI_SCANNER_TYPED);
+
+ if ($config === false) {
+ throw new \Exception('Error parsing INI config file ' . $filepath);
+ }
+
+ return $config;
+ }
+
+ /**
+ * Tries to load the specified configuration file and returns the config array.
+ *
+ * The config format is PHP array and the template for configuration files is the following:
+ *
+ * <?php return [
+ * 'section' => [
+ * 'key' => 'value',
+ * ],
+ * ];
+ *
+ * @param string $filepath The filepath of the
+ * @return array The config array0
+ *
+ * @throws \Exception if the config cannot get loaded.
+ */
+ private function loadConfigFile($filepath)
+ {
+ $config = include($filepath);
+
+ if (!is_array($config)) {
+ throw new \Exception('Error loading config file ' . $filepath);
+ }
+
+ return $config;
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config\Cache;
+
+/**
+ * The interface for a system-wide ConfigCache
+ */
+interface IConfigCache
+{
+ /**
+ * Tries to load the specified configuration array into the config array.
+ * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config.
+ *
+ * @param array $config
+ * @param bool $overwrite Force value overwrite if the config key already exists
+ */
+ function load(array $config, $overwrite = false);
+
+ /**
+ * Gets a value from the config cache.
+ *
+ * @param string $cat Config category
+ * @param string $key Config key
+ *
+ * @return mixed Returns the value of the Config entry or '!<unset>!' if not set
+ */
+ function get($cat, $key = null);
+
+ /**
+ * Sets a value in the config cache. Accepts raw output from the config table
+ *
+ * @param string $cat Config category
+ * @param string $key Config key
+ * @param mixed $value Value to set
+ *
+ * @return bool True, if the value is set
+ */
+ function set($cat, $key, $value);
+
+ /**
+ * Deletes a value from the config cache.
+ *
+ * @param string $cat Config category
+ * @param string $key Config key
+ *
+ * @return bool true, if deleted
+ */
+ function delete($cat, $key);
+
+ /**
+ * Checks if a value is set in the config cache.
+ *
+ * @param string $cat Config category
+ * @param string $key Config key
+ * @return bool
+ */
+ function has($cat, $key = null);
+
+ /**
+ * Returns the whole configuration cache
+ *
+ * @return array
+ */
+ function getAll();
+}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config\Cache;
+
+/**
+ * The interface for a user-specific config cache
+ */
+interface IPConfigCache
+{
+ /**
+ * Tries to load the specified configuration array into the user specific config array.
+ * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config.
+ *
+ * @param int $uid
+ * @param array $config
+ */
+ function loadP($uid, array $config);
+
+ /**
+ * Retrieves a value from the user config cache
+ *
+ * @param int $uid User Id
+ * @param string $cat Config category
+ * @param string $key Config key
+ *
+ * @return string The value of the config entry or '!<unset>!' if not set
+ */
+ function getP($uid, $cat, $key = null);
+
+ /**
+ * Sets a value in the user config cache
+ *
+ * Accepts raw output from the pconfig table
+ *
+ * @param int $uid User Id
+ * @param string $cat Config category
+ * @param string $key Config key
+ * @param mixed $value Value to set
+ */
+ function setP($uid, $cat, $key, $value);
+
+ /**
+ * Deletes a value from the user config cache
+ *
+ * @param int $uid User Id
+ * @param string $cat Config category
+ * @param string $key Config key
+ *
+ * @return bool true, if deleted
+ */
+ function deleteP($uid, $cat, $key);
+
+
+ /**
+ * Checks if a value is set in the user config cache.
+ *
+ * @param int $uid User Id
+ * @param string $cat Config category
+ * @param string $key Config key
+ * @return bool
+ */
+ function hasP($uid, $cat, $key = null);
+
+ /**
+ * Returns the whole configuration cache
+ *
+ * @return array
+ */
+ function getAll();
+}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Config;
-
-/**
- * The Friendica config cache for the application
- * Initial, all *.config.php files are loaded into this cache with the
- * ConfigCacheLoader ( @see ConfigCacheLoader )
- *
- * Is used for further caching operations too (depending on the ConfigAdapter )
- */
-class ConfigCache implements IConfigCache, IPConfigCache
-{
- private $config;
-
- /**
- * @param array $config A initial config array
- */
- public function __construct(array $config = [])
- {
- $this->loadConfigArray($config);
- }
-
- /**
- * Tries to load the specified configuration array into the App->config array.
- * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config.
- *
- * @param array $config
- * @param bool $overwrite Force value overwrite if the config key already exists
- */
- public function loadConfigArray(array $config, $overwrite = false)
- {
- foreach ($config as $category => $values) {
- foreach ($values as $key => $value) {
- if ($overwrite) {
- $this->set($category, $key, $value);
- } else {
- $this->setDefault($category, $key, $value);
- }
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function get($cat, $key = null, $default = null)
- {
- $return = $default;
-
- if ($cat === 'config') {
- if (isset($this->config[$key])) {
- $return = $this->config[$key];
- }
- } else {
- if (isset($this->config[$cat][$key])) {
- $return = $this->config[$cat][$key];
- } elseif ($key == null && isset($this->config[$cat])) {
- $return = $this->config[$cat];
- }
- }
-
- return $return;
- }
-
- /**
- * Sets a default value in the config cache. Ignores already existing keys.
- *
- * @param string $cat Config category
- * @param string $k Config key
- * @param mixed $v Default value to set
- */
- private function setDefault($cat, $k, $v)
- {
- if (!isset($this->config[$cat][$k])) {
- $this->set($cat, $k, $v);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function set($cat, $key, $value)
- {
- // Only arrays are serialized in database, so we have to unserialize sparingly
- $value = is_string($value) && preg_match("|^a:[0-9]+:{.*}$|s", $value) ? unserialize($value) : $value;
-
- if ($cat === 'config') {
- $this->config[$key] = $value;
- } else {
- if (!isset($this->config[$cat])) {
- $this->config[$cat] = [];
- }
-
- $this->config[$cat][$key] = $value;
- }
-
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function delete($cat, $key)
- {
- if ($cat === 'config') {
- if (isset($this->config[$key])) {
- unset($this->config[$key]);
- }
- } else {
- if (isset($this->config[$cat][$key])) {
- unset($this->config[$cat][$key]);
- if (count($this->config[$cat]) == 0) {
- unset($this->config[$cat]);
- }
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getP($uid, $cat, $key = null, $default = null)
- {
- $return = $default;
-
- if (isset($this->config[$uid][$cat][$key])) {
- $return = $this->config[$uid][$cat][$key];
- } elseif ($key === null && isset($this->config[$uid][$cat])) {
- $return = $this->config[$uid][$cat];
- }
-
- return $return;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setP($uid, $cat, $key, $value)
- {
- // Only arrays are serialized in database, so we have to unserialize sparingly
- $value = is_string($value) && preg_match("|^a:[0-9]+:{.*}$|s", $value) ? unserialize($value) : $value;
-
- if (!isset($this->config[$uid]) || !is_array($this->config[$uid])) {
- $this->config[$uid] = [];
- }
-
- if (!isset($this->config[$uid][$cat]) || !is_array($this->config[$uid][$cat])) {
- $this->config[$uid][$cat] = [];
- }
-
- if ($key === null) {
- $this->config[$uid][$cat] = $value;
- } else {
- $this->config[$uid][$cat][$key] = $value;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function deleteP($uid, $cat, $key)
- {
- if (isset($this->config[$uid][$cat][$key])) {
- unset($this->config[$uid][$cat][$key]);
- if (count($this->config[$uid][$cat]) == 0) {
- unset($this->config[$uid][$cat]);
- if (count($this->config[$uid]) == 0) {
- unset($this->config[$uid]);
- }
- }
- }
- }
-
- /**
- * Returns the whole configuration
- *
- * @return array The configuration
- */
- public function getAll()
- {
- return $this->config;
- }
-}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Config;
-
-use Friendica\Core\Addon;
-
-/**
- * The ConfigCacheLoader loads config-files and stores them in a ConfigCache ( @see ConfigCache )
- *
- * It is capable of loading the following config files:
- * - *.config.php (current)
- * - *.ini.php (deprecated)
- * - *.htconfig.php (deprecated)
- */
-class ConfigCacheLoader
-{
- /**
- * The Sub directory of the config-files
- * @var string
- */
- const SUBDIRECTORY = 'config';
-
- private $baseDir;
- private $configDir;
-
- public function __construct($baseDir)
- {
- $this->baseDir = $baseDir;
- $this->configDir = $baseDir . DIRECTORY_SEPARATOR . self::SUBDIRECTORY;
- }
-
- /**
- * Load the configuration files
- *
- * First loads the default value for all the configuration keys, then the legacy configuration files, then the
- * expected local.config.php
- */
- public function loadConfigFiles(ConfigCache $config)
- {
- // Setting at least the basepath we know
- $config->set('system', 'basepath', $this->baseDir);
-
- $config->loadConfigArray($this->loadCoreConfig('defaults'));
- $config->loadConfigArray($this->loadCoreConfig('settings'));
-
- $config->loadConfigArray($this->loadLegacyConfig('htpreconfig'), true);
- $config->loadConfigArray($this->loadLegacyConfig('htconfig'), true);
-
- $config->loadConfigArray($this->loadCoreConfig('local'), true);
- }
-
- /**
- * Tries to load the specified core-configuration and returns the config array.
- *
- * @param string $name The name of the configuration
- *
- * @return array The config array (empty if no config found)
- *
- * @throws \Exception if the configuration file isn't readable
- */
- public function loadCoreConfig($name)
- {
- if (file_exists($this->configDir . DIRECTORY_SEPARATOR . $name . '.config.php')) {
- return $this->loadConfigFile($this->configDir . DIRECTORY_SEPARATOR . $name . '.config.php');
- } elseif (file_exists($this->configDir . DIRECTORY_SEPARATOR . $name . '.ini.php')) {
- return $this->loadINIConfigFile($this->configDir . DIRECTORY_SEPARATOR . $name . '.ini.php');
- } else {
- return [];
- }
- }
-
- /**
- * Tries to load the specified addon-configuration and returns the config array.
- *
- * @param string $name The name of the configuration
- *
- * @return array The config array (empty if no config found)
- *
- * @throws \Exception if the configuration file isn't readable
- */
- public function loadAddonConfig($name)
- {
- $filepath = $this->baseDir . DIRECTORY_SEPARATOR . // /var/www/html/
- Addon::DIRECTORY . DIRECTORY_SEPARATOR . // addon/
- $name . DIRECTORY_SEPARATOR . // openstreetmap/
- self::SUBDIRECTORY . DIRECTORY_SEPARATOR . // config/
- $name . ".config.php"; // openstreetmap.config.php
-
- if (file_exists($filepath)) {
- return $this->loadConfigFile($filepath);
- } else {
- return [];
- }
- }
-
- /**
- * Tries to load the legacy config files (.htconfig.php, .htpreconfig.php) and returns the config array.
- *
- * @param string $name The name of the config file
- *
- * @return array The configuration array (empty if no config found)
- *
- * @deprecated since version 2018.09
- */
- private function loadLegacyConfig($name)
- {
- $filePath = $this->baseDir . DIRECTORY_SEPARATOR . '.' . $name . '.php';
-
- if (file_exists($filePath)) {
- $a = new \stdClass();
- $a->config = [];
- include $filePath;
-
- if (isset($db_host)) {
- $a->config['database']['hostname'] = $db_host;
- unset($db_host);
- }
- if (isset($db_user)) {
- $a->config['database']['username'] = $db_user;
- unset($db_user);
- }
- if (isset($db_pass)) {
- $a->config['database']['password'] = $db_pass;
- unset($db_pass);
- }
- if (isset($db_data)) {
- $a->config['database']['database'] = $db_data;
- unset($db_data);
- }
- if (isset($a->config['system']['db_charset'])) {
- $a->config['database']['charset'] = $a->config['system']['charset'];
- }
- if (isset($pidfile)) {
- $a->config['system']['pidfile'] = $pidfile;
- unset($pidfile);
- }
- if (isset($default_timezone)) {
- $a->config['system']['default_timezone'] = $default_timezone;
- unset($default_timezone);
- }
- if (isset($lang)) {
- $a->config['system']['language'] = $lang;
- unset($lang);
- }
-
- return $a->config;
- } else {
- return [];
- }
- }
-
- /**
- * Tries to load the specified legacy configuration file and returns the config array.
- *
- * @deprecated since version 2018.12
- * @param string $filepath
- *
- * @return array The configuration array
- * @throws \Exception
- */
- private function loadINIConfigFile($filepath)
- {
- $contents = include($filepath);
-
- $config = parse_ini_string($contents, true, INI_SCANNER_TYPED);
-
- if ($config === false) {
- throw new \Exception('Error parsing INI config file ' . $filepath);
- }
-
- return $config;
- }
-
- /**
- * Tries to load the specified configuration file and returns the config array.
- *
- * The config format is PHP array and the template for configuration files is the following:
- *
- * <?php return [
- * 'section' => [
- * 'key' => 'value',
- * ],
- * ];
- *
- * @param string $filepath The filepath of the
- * @return array The config array0
- *
- * @throws \Exception if the config cannot get loaded.
- */
- private function loadConfigFile($filepath)
- {
- $config = include($filepath);
-
- if (!is_array($config)) {
- throw new \Exception('Error loading config file ' . $filepath);
- }
-
- return $config;
- }
-}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config;
+
+/**
+ * This class is responsible for all system-wide configuration values in Friendica
+ * There are two types of storage
+ * - The Config-Files (loaded into the FileCache @see Cache\IConfigCache )
+ * - The Config-DB-Table (per Config-DB-adapter @see Adapter\IConfigAdapter )
+ */
+class Configuration
+{
+ /**
+ * @var Cache\IConfigCache
+ */
+ private $configCache;
+
+ /**
+ * @var Adapter\IConfigAdapter
+ */
+ private $configAdapter;
+
+ /**
+ * @param Cache\IConfigCache $configCache The configuration cache (based on the config-files)
+ * @param Adapter\IConfigAdapter $configAdapter The configuration DB-backend
+ */
+ public function __construct(Cache\IConfigCache $configCache, Adapter\IConfigAdapter $configAdapter)
+ {
+ $this->configCache = $configCache;
+ $this->configAdapter = $configAdapter;
+
+ $this->load();
+ }
+
+ /**
+ * Returns the Config Cache
+ *
+ * @return Cache\IConfigCache
+ */
+ public function getCache()
+ {
+ return $this->configCache;
+ }
+
+ /**
+ * @brief Loads all configuration values of family into a cached storage.
+ *
+ * All configuration values of the system are stored in the cache ( @see IConfigCache )
+ *
+ * @param string $cat The category of the configuration value
+ *
+ * @return void
+ */
+ public function load($cat = 'config')
+ {
+ // If not connected, do nothing
+ if (!$this->configAdapter->isConnected()) {
+ return;
+ }
+
+ // load the whole category out of the DB into the cache
+ $this->configCache->load($this->configAdapter->load($cat), true);
+ }
+
+ /**
+ * @brief Get a particular user's config variable given the category name
+ * ($cat) and a $key.
+ *
+ * Get a particular config value from the given category ($cat)
+ * and the $key from a cached storage either from the $this->configAdapter
+ * (@see IConfigAdapter ) or from the $this->configCache (@see IConfigCache ).
+ *
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to query
+ * @param mixed $default_value optional, The value to return if key is not set (default: null)
+ * @param boolean $refresh optional, If true the config is loaded from the db and not from the cache (default: false)
+ *
+ * @return mixed Stored value or null if it does not exist
+ */
+ public function get($cat, $key, $default_value = null, $refresh = false)
+ {
+ // Return the value of the cache if found and no refresh is forced
+ if (!$refresh && $this->configCache->has($cat, $key)) {
+ return $this->configCache->get($cat, $key);
+ }
+
+ // if we don't find the value in the cache and the adapter isn't ready, return the default value
+ if (!$this->configAdapter->isConnected()) {
+ return $default_value;
+ }
+
+ // load DB value to cache
+ $dbvalue = $this->configAdapter->get($cat, $key);
+
+ if ($dbvalue !== '!<unset>!') {
+ $this->configCache->set($cat, $key, $dbvalue);
+ return $dbvalue;
+ } else {
+ return $default_value;
+ }
+ }
+
+ /**
+ * @brief Sets a configuration value for system config
+ *
+ * Stores a config value ($value) in the category ($cat) under the key ($key)
+ *
+ * Note: Please do not store booleans - convert to 0/1 integer values!
+ *
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to set
+ * @param mixed $value The value to store
+ *
+ * @return bool Operation success
+ */
+ public function set($cat, $key, $value)
+ {
+ // set the cache first
+ $cached = $this->configCache->set($cat, $key, $value);
+
+ // If there is no connected adapter, we're finished
+ if (!$this->configAdapter->isConnected()) {
+ return $cached;
+ }
+
+ $stored = $this->configAdapter->set($cat, $key, $value);
+
+ return $cached && $stored;
+ }
+
+ /**
+ * @brief Deletes the given key from the system configuration.
+ *
+ * Removes the configured value from the stored cache in $this->configCache
+ * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter ).
+ *
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to delete
+ *
+ * @return bool
+ */
+ public function delete($cat, $key)
+ {
+ $cacheRemoved = $this->configCache->delete($cat, $key);
+
+ if (!$this->configAdapter->isConnected()) {
+ return $cacheRemoved;
+ }
+
+ $storeRemoved = $this->configAdapter->delete($cat, $key);
+
+ return $cacheRemoved || $storeRemoved;
+ }
+}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Config;
-
-/**
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
- */
-interface IConfigAdapter
-{
- /**
- * Loads all configuration values into a cached storage.
- *
- * @param string $cat The category of the configuration values to load
- *
- * @return void
- */
- public function load($cat = "config");
-
- /**
- * Get a particular user's config variable given the category name
- * ($family) and a key.
- *
- * @param string $cat The category of the configuration value
- * @param string $k The configuration key to query
- * @param mixed $default_value optional, The value to return if key is not set (default: null)
- * @param boolean $refresh optional, If true the config is loaded from the db and not from the cache (default: false)
- *
- * @return mixed Stored value or null if it does not exist
- */
- public function get($cat, $k, $default_value = null, $refresh = false);
-
- /**
- * Stores a config value ($value) in the category ($family) under the key ($key)
- * for the user_id $uid.
- *
- * Note: Please do not store booleans - convert to 0/1 integer values!
- *
- * @param string $cat The category of the configuration value
- * @param string $k The configuration key to set
- * @param mixed $value The value to store
- *
- * @return bool Operation success
- */
- public function set($cat, $k, $value);
-
- /**
- * Removes the configured value from the stored cache
- * and removes it from the database.
- *
- * @param string $cat The category of the configuration value
- * @param string $k The configuration key to delete
- *
- * @return mixed
- */
- public function delete($cat, $k);
-
- /**
- * Checks, if the current adapter is connected to the backend
- *
- * @return bool
- */
- public function isConnected();
-}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Config;
-
-/**
- * The interface for a system-wide ConfigCache
- */
-interface IConfigCache
-{
- /**
- * @param string $cat Config category
- * @param string $key Config key
- * @param mixed $default Default value if it isn't set
- *
- * @return mixed Returns the value of the Config entry
- */
- function get($cat, $key = null, $default = null);
-
- /**
- * Sets a value in the config cache. Accepts raw output from the config table
- *
- * @param string $cat Config category
- * @param string $key Config key
- * @param mixed $value Value to set
- *
- * @return bool True, if the value is set
- */
- function set($cat, $key, $value);
-
- /**
- * Deletes a value from the config cache
- *
- * @param string $cat Config category
- * @param string $key Config key
- */
- function delete($cat, $key);
-
- function getAll();
-}
+++ /dev/null
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace Friendica\Core\Config;
-
-/**
- *
- * @author benlo
- */
-interface IPConfigAdapter
-{
- /**
- * Loads all configuration values of a user's config family into a cached storage.
- *
- * @param string $uid The user_id
- * @param string $cat The category of the configuration value
- *
- * @return void
- */
- public function load($uid, $cat);
-
- /**
- * Get a particular user's config variable given the category name
- * ($family) and a key.
- *
- * @param string $uid The user_id
- * @param string $cat The category of the configuration value
- * @param string $k The configuration key to query
- * @param mixed $default_value optional, The value to return if key is not set (default: null)
- * @param boolean $refresh optional, If true the config is loaded from the db and not from the cache (default: false)
- *
- * @return mixed Stored value or null if it does not exist
- */
- public function get($uid, $cat, $k, $default_value = null, $refresh = false);
-
- /**
- * Stores a config value ($value) in the category ($family) under the key ($key)
- * for the user_id $uid.
- *
- * @note Please do not store booleans - convert to 0/1 integer values!
- *
- * @param string $uid The user_id
- * @param string $cat The category of the configuration value
- * @param string $k The configuration key to set
- * @param string $value The value to store
- *
- * @return bool Operation success
- */
- public function set($uid, $cat, $k, $value);
-
- /**
- * Removes the configured value from the stored cache
- * and removes it from the database.
- *
- * @param string $uid The user_id
- * @param string $cat The category of the configuration value
- * @param string $k The configuration key to delete
- *
- * @return mixed
- */
- public function delete($uid, $cat, $k);
-}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Config;
-
-/**
- * The interface for a user-specific config cache
- */
-interface IPConfigCache
-{
- /**
- * Retrieves a value from the user config cache
- *
- * @param int $uid User Id
- * @param string $cat Config category
- * @param string $key Config key
- * @param mixed $default Default value if key isn't set
- *
- * @return string The value of the config entry
- */
- function getP($uid, $cat, $key = null, $default = null);
-
- /**
- * Sets a value in the user config cache
- *
- * Accepts raw output from the pconfig table
- *
- * @param int $uid User Id
- * @param string $cat Config category
- * @param string $key Config key
- * @param mixed $value Value to set
- */
- function setP($uid, $cat, $key, $value);
-
- /**
- * Deletes a value from the user config cache
- *
- * @param int $uid User Id
- * @param string $cat Config category
- * @param string $key Config key
- */
- function deleteP($uid, $cat, $key);
-
- function getAll();
-}
+++ /dev/null
-<?php
-namespace Friendica\Core\Config;
-
-use Friendica\Database\DBA;
-
-/**
- * JustInTime Configuration Adapter
- *
- * Default Config Adapter. Provides the best performance for pages loading few configuration variables.
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
- */
-class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapter
-{
- private $cache;
- private $in_db;
-
- /**
- * @var IConfigCache The config cache of this driver
- */
- private $configCache;
-
- /**
- * @param IConfigCache $configCache The config cache of this driver
- */
- public function __construct(IConfigCache $configCache)
- {
- $this->configCache = $configCache;
- $this->connected = DBA::connected();
- }
-
- /**
- * {@inheritdoc}
- */
- public function load($cat = "config")
- {
- if (!$this->isConnected()) {
- return;
- }
-
- // We don't preload "system" anymore.
- // This reduces the number of database reads a lot.
- if ($cat === 'system') {
- return;
- }
-
- $configs = DBA::select('config', ['v', 'k'], ['cat' => $cat]);
- while ($config = DBA::fetch($configs)) {
- $k = $config['k'];
-
- $this->configCache->set($cat, $k, $config['v']);
-
- if ($cat !== 'config') {
- $this->cache[$cat][$k] = $config['v'];
- $this->in_db[$cat][$k] = true;
- }
- }
- DBA::close($configs);
- }
-
- /**
- * {@inheritdoc}
- */
- public function get($cat, $k, $default_value = null, $refresh = false)
- {
- if (!$this->isConnected()) {
- return $default_value;
- }
-
- if (!$refresh) {
- // Do we have the cached value? Then return it
- if (isset($this->cache[$cat][$k])) {
- if ($this->cache[$cat][$k] === '!<unset>!') {
- return $default_value;
- } else {
- return $this->cache[$cat][$k];
- }
- }
- }
-
- $config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
- if (DBA::isResult($config)) {
- // manage array value
- $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
-
- // Assign the value from the database to the cache
- $this->cache[$cat][$k] = $value;
- $this->in_db[$cat][$k] = true;
- return $value;
- } elseif ($this->configCache->get($cat, $k) !== null) {
- // Assign the value (mostly) from config/local.config.php file to the cache
- $this->cache[$cat][$k] = $this->configCache->get($cat, $k);
- $this->in_db[$cat][$k] = false;
-
- return $this->configCache->get($cat, $k);
- } elseif ($this->configCache->get('config', $k) !== null) {
- // Assign the value (mostly) from config/local.config.php file to the cache
- $this->cache[$k] = $this->configCache->get('config', $k);
- $this->in_db[$k] = false;
-
- return $this->configCache->get('config', $k);
- }
-
- $this->cache[$cat][$k] = '!<unset>!';
- $this->in_db[$cat][$k] = false;
-
- return $default_value;
- }
-
- /**
- * {@inheritdoc}
- */
- public function set($cat, $k, $value)
- {
- if (!$this->isConnected()) {
- return false;
- }
-
- // We store our setting values in a string variable.
- // So we have to do the conversion here so that the compare below works.
- // The exception are array values.
- $dbvalue = (!is_array($value) ? (string)$value : $value);
-
- $stored = $this->get($cat, $k, null, true);
-
- if (!isset($this->in_db[$cat])) {
- $this->in_db[$cat] = [];
- }
- if (!isset($this->in_db[$cat][$k])) {
- $this->in_db[$cat] = false;
- }
-
- if (($stored === $dbvalue) && $this->in_db[$cat][$k]) {
- return true;
- }
-
- $this->configCache->set($cat, $k, $value);
-
- // Assign the just added value to the cache
- $this->cache[$cat][$k] = $dbvalue;
-
- // manage array value
- $dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
-
- $result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
-
- if ($result) {
- $this->in_db[$cat][$k] = true;
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function delete($cat, $k)
- {
- if (!$this->isConnected()) {
- return false;
- }
-
- if (isset($this->cache[$cat][$k])) {
- unset($this->cache[$cat][$k]);
- unset($this->in_db[$cat][$k]);
- }
-
- $result = DBA::delete('config', ['cat' => $cat, 'k' => $k]);
-
- return $result;
- }
-}
+++ /dev/null
-<?php
-namespace Friendica\Core\Config;
-
-use Friendica\Database\DBA;
-
-/**
- * JustInTime User Configuration Adapter
- *
- * Default PConfig Adapter. Provides the best performance for pages loading few configuration variables.
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
- */
-class JITPConfigAdapter implements IPConfigAdapter
-{
- private $in_db;
-
- /**
- * The config cache of this adapter
- * @var IPConfigCache
- */
- private $configCache;
-
- /**
- * @param IPConfigCache $configCache The config cache of this adapter
- */
- public function __construct(IPConfigCache $configCache)
- {
- $this->configCache = $configCache;
- }
-
- /**
- * {@inheritdoc}
- */
- public function load($uid, $cat)
- {
- $pconfigs = DBA::select('pconfig', ['v', 'k'], ['cat' => $cat, 'uid' => $uid]);
- if (DBA::isResult($pconfigs)) {
- while ($pconfig = DBA::fetch($pconfigs)) {
- $k = $pconfig['k'];
-
- $this->configCache->setP($uid, $cat, $k, $pconfig['v']);
-
- $this->in_db[$uid][$cat][$k] = true;
- }
- } else if ($cat != 'config') {
- // Negative caching
- $this->configCache->setP($uid, $cat, null, "!<unset>!");
- }
- DBA::close($pconfigs);
- }
-
- /**
- * {@inheritdoc}
- */
- public function get($uid, $cat, $k, $default_value = null, $refresh = false)
- {
- if (!$refresh) {
- // Looking if the whole family isn't set
- if ($this->configCache->getP($uid, $cat) !== null) {
- if ($this->configCache->getP($uid, $cat) === '!<unset>!') {
- return $default_value;
- }
- }
-
- if ($this->configCache->getP($uid, $cat, $k) !== null) {
- if ($this->configCache->getP($uid, $cat, $k) === '!<unset>!') {
- return $default_value;
- }
- return $this->configCache->getP($uid, $cat, $k);
- }
- }
-
- $pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
- if (DBA::isResult($pconfig)) {
- $val = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
-
- $this->configCache->setP($uid, $cat, $k, $val);
-
- $this->in_db[$uid][$cat][$k] = true;
-
- return $val;
- } else {
- $this->configCache->setP($uid, $cat, $k, '!<unset>!');
-
- $this->in_db[$uid][$cat][$k] = false;
-
- return $default_value;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function set($uid, $cat, $k, $value)
- {
- // We store our setting values in a string variable.
- // So we have to do the conversion here so that the compare below works.
- // The exception are array values.
- $dbvalue = (!is_array($value) ? (string)$value : $value);
-
- $stored = $this->get($uid, $cat, $k, null, true);
-
- if (($stored === $dbvalue) && $this->in_db[$uid][$cat][$k]) {
- return true;
- }
-
- $this->configCache->setP($uid, $cat, $k, $value);
-
- // manage array value
- $dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
-
- $result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
-
- if ($result) {
- $this->in_db[$uid][$cat][$k] = true;
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function delete($uid, $cat, $k)
- {
- $this->configCache->deleteP($uid, $cat, $k);
-
- if (!empty($this->in_db[$uid][$cat][$k])) {
- unset($this->in_db[$uid][$cat][$k]);
- }
-
- $result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-
- return $result;
- }
-}
--- /dev/null
+<?php
+
+namespace Friendica\Core\Config;
+
+/**
+ * This class is responsible for the user-specific configuration values in Friendica
+ * The values are set through the Config-DB-Table (per Config-DB-adapter @see Adapter\IPConfigAdapter )
+ *
+ * The configuration cache (@see Cache\IPConfigCache ) is used for temporary caching of database calls. This will
+ * increase the performance.
+ */
+class PConfiguration
+{
+ /**
+ * @var Cache\IPConfigCache
+ */
+ private $configCache;
+
+ /**
+ * @var Adapter\IPConfigAdapter
+ */
+ private $configAdapter;
+
+ /**
+ * @param Cache\IPConfigCache $configCache The configuration cache
+ * @param Adapter\IPConfigAdapter $configAdapter The configuration DB-backend
+ */
+ public function __construct(Cache\IPConfigCache $configCache, Adapter\IPConfigAdapter $configAdapter)
+ {
+ $this->configCache = $configCache;
+ $this->configAdapter = $configAdapter;
+ }
+
+ /**
+ * @brief Loads all configuration values of a user's config family into a cached storage.
+ *
+ * All configuration values of the given user are stored with the $uid in
+ * the cache ( @see IPConfigCache )
+ *
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
+ *
+ * @return void
+ */
+ public function load($uid, $cat = 'config')
+ {
+ // If not connected, do nothing
+ if (!$this->configAdapter->isConnected()) {
+ return;
+ }
+
+ // load the whole category out of the DB into the cache
+ $this->configCache->loadP($uid, $this->configAdapter->load($uid, $cat));
+ }
+
+ /**
+ * @brief Get a particular user's config variable given the category name
+ * ($cat) and a key.
+ *
+ * Get a particular user's config value from the given category ($cat)
+ * and the $key with the $uid from a cached storage either from the $this->configAdapter
+ * (@see IConfigAdapter ) or from the $this->configCache (@see IConfigCache ).
+ *
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to query
+ * @param mixed $default_value optional, The value to return if key is not set (default: null)
+ * @param boolean $refresh optional, If true the config is loaded from the db and not from the cache (default: false)
+ *
+ * @return mixed Stored value or null if it does not exist
+ */
+ public function get($uid, $cat, $key, $default_value = null, $refresh = false)
+ {
+ // Return the value of the cache if found and no refresh is forced
+ if (!$refresh && $this->configCache->hasP($uid, $cat, $key)) {
+ return $this->configCache->getP($uid, $cat, $key);
+ }
+
+ // if we don't find the value in the cache and the adapter isn't ready, return the default value
+ if (!$this->configAdapter->isConnected()) {
+ return $default_value;
+ }
+
+ // load DB value to cache
+ $dbvalue = $this->configAdapter->get($uid, $cat, $key);
+
+ if ($dbvalue !== '!<unset>!') {
+ $this->configCache->setP($uid, $cat, $key, $dbvalue);
+ return $dbvalue;
+ } else {
+ return $default_value;
+ }
+ }
+
+ /**
+ * @brief Sets a configuration value for a user
+ *
+ * Stores a config value ($value) in the category ($family) under the key ($key)
+ * for the user_id $uid.
+ *
+ * @note Please do not store booleans - convert to 0/1 integer values!
+ *
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to set
+ * @param mixed $value The value to store
+ *
+ * @return bool Operation success
+ */
+ public function set($uid, $cat, $key, $value)
+ {
+ // set the cache first
+ $cached = $this->configCache->setP($uid, $cat, $key, $value);
+
+ // If there is no connected adapter, we're finished
+ if (!$this->configAdapter->isConnected()) {
+ return $cached;
+ }
+
+ $stored = $this->configAdapter->set($uid, $cat, $key, $value);
+
+ return $cached && $stored;
+ }
+
+ /**
+ * @brief Deletes the given key from the users's configuration.
+ *
+ * Removes the configured value from the stored cache in $this->configCache
+ * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter )
+ * with the given $uid.
+ *
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to delete
+ *
+ * @return bool
+ */
+ public function delete($uid, $cat, $key)
+ {
+ $cacheRemoved = $this->configCache->deleteP($uid, $cat, $key);
+
+ if (!$this->configAdapter->isConnected()) {
+ return $cacheRemoved;
+ }
+
+ $storeRemoved = $this->configAdapter->delete($uid, $cat, $key);
+
+ return $cacheRemoved || $storeRemoved;
+ }
+}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Config;
-
-use Exception;
-use Friendica\Database\DBA;
-
-/**
- * Preload Configuration Adapter
- *
- * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
- */
-class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapter
-{
- private $config_loaded = false;
-
- /**
- * @var IConfigCache The config cache of this driver
- */
- private $configCache;
-
- /**
- * @param IConfigCache $configCache The config cache of this driver
- */
- public function __construct(IConfigCache $configCache)
- {
- $this->configCache = $configCache;
- $this->connected = DBA::connected();
- $this->load();
- }
-
- /**
- * {@inheritdoc}
- */
- public function load($family = 'config')
- {
- if (!$this->isConnected()) {
- return;
- }
-
- if ($this->config_loaded) {
- return;
- }
-
- $configs = DBA::select('config', ['cat', 'v', 'k']);
- while ($config = DBA::fetch($configs)) {
- $this->configCache->set($config['cat'], $config['k'], $config['v']);
- }
- DBA::close($configs);
-
- $this->config_loaded = true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function get($cat, $k, $default_value = null, $refresh = false)
- {
- if (!$this->isConnected()) {
- return $default_value;
- }
-
- if ($refresh) {
- $config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
- if (DBA::isResult($config)) {
- $this->configCache->set($cat, $k, $config['v']);
- }
- }
-
- $return = $this->configCache->get($cat, $k, $default_value);
-
- return $return;
- }
-
- /**
- * {@inheritdoc}
- */
- public function set($cat, $k, $value)
- {
- if (!$this->isConnected()) {
- return false;
- }
-
- // We store our setting values as strings.
- // So we have to do the conversion here so that the compare below works.
- // The exception are array values.
- $compare_value = !is_array($value) ? (string)$value : $value;
-
- if ($this->configCache->get($cat, $k) === $compare_value) {
- return true;
- }
-
- $this->configCache->set($cat, $k, $value);
-
- // manage array value
- $dbvalue = is_array($value) ? serialize($value) : $value;
-
- $result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
- if (!$result) {
- throw new Exception('Unable to store config value in [' . $cat . '][' . $k . ']');
- }
-
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function delete($cat, $k)
- {
- if (!$this->isConnected()) {
- return false;
- }
-
- $this->configCache->delete($cat, $k);
-
- $result = DBA::delete('config', ['cat' => $cat, 'k' => $k]);
-
- return $result;
- }
-}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Config;
-
-use Exception;
-use Friendica\Database\DBA;
-
-/**
- * Preload User Configuration Adapter
- *
- * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
- */
-class PreloadPConfigAdapter implements IPConfigAdapter
-{
- private $config_loaded = false;
-
- /**
- * The config cache of this adapter
- * @var IPConfigCache
- */
- private $configCache;
-
- /**
- * @param IPConfigCache $configCache The config cache of this adapter
- * @param int $uid The UID of the current user
- */
- public function __construct(IPConfigCache $configCache, $uid = null)
- {
- $this->configCache = $configCache;
- if (isset($uid)) {
- $this->load($uid, 'config');
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function load($uid, $family)
- {
- if ($this->config_loaded) {
- return;
- }
-
- if (empty($uid)) {
- return;
- }
-
- $pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
- while ($pconfig = DBA::fetch($pconfigs)) {
- $this->configCache->setP($uid, $pconfig['cat'], $pconfig['k'], $pconfig['v']);
- }
- DBA::close($pconfigs);
-
- $this->config_loaded = true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function get($uid, $cat, $k, $default_value = null, $refresh = false)
- {
- if (!$this->config_loaded) {
- $this->load($uid, $cat);
- }
-
- if ($refresh) {
- $config = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
- if (DBA::isResult($config)) {
- $this->configCache->setP($uid, $cat, $k, $config['v']);
- } else {
- $this->configCache->deleteP($uid, $cat, $k);
- }
- }
-
- return $this->configCache->getP($uid, $cat, $k, $default_value);;
- }
-
- /**
- * {@inheritdoc}
- */
- public function set($uid, $cat, $k, $value)
- {
- if (!$this->config_loaded) {
- $this->load($uid, $cat);
- }
- // We store our setting values as strings.
- // So we have to do the conversion here so that the compare below works.
- // The exception are array values.
- $compare_value = !is_array($value) ? (string)$value : $value;
-
- if ($this->configCache->getP($uid, $cat, $k) === $compare_value) {
- return true;
- }
-
- $this->configCache->setP($uid, $cat, $k, $value);
-
- // manage array value
- $dbvalue = is_array($value) ? serialize($value) : $value;
-
- $result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
- if (!$result) {
- throw new Exception('Unable to store config value in [' . $uid . '][' . $cat . '][' . $k . ']');
- }
-
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function delete($uid, $cat, $k)
- {
- if (!$this->config_loaded) {
- $this->load($uid, $cat);
- }
-
- $this->configCache->deleteP($uid, $cat, $k);
-
- $result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-
- return $result;
- }
-}
}
}
- $db_host = $a->getConfig()->get('database', 'hostname');
- $db_user = $a->getConfig()->get('database', 'username');
- $db_pass = $a->getConfig()->get('database', 'password');
- $db_data = $a->getConfig()->get('database', 'database');
+ $db_host = $a->getConfigCache()->get('database', 'hostname');
+ $db_user = $a->getConfigCache()->get('database', 'username');
+ $db_pass = $a->getConfigCache()->get('database', 'password');
+ $db_data = $a->getConfigCache()->get('database', 'database');
} else {
// Creating config file
$this->out("Creating config file...\n");
$installer->resetChecks();
- if (!$installer->checkDB($a->getConfig(), $a->getProfiler(), $db_host, $db_user, $db_pass, $db_data)) {
+ if (!$installer->checkDB($a->getConfigCache(), $a->getProfiler(), $db_host, $db_user, $db_pass, $db_data)) {
$errorMessage = $this->extractErrors($installer->getChecks());
throw new RuntimeException($errorMessage);
}
$cat = $this->getArgument(0);
Core\Config::load($cat);
- if ($a->getConfig()->get($cat) !== null) {
+ if ($a->getConfigCache()->get($cat) !== null) {
$this->out("[{$cat}]");
- $catVal = $a->getConfig()->get($cat);
+ $catVal = $a->getConfigCache()->get($cat);
foreach ($catVal as $key => $value) {
if (is_array($value)) {
foreach ($value as $k => $v) {
$this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');
}
- $config = $a->getConfig()->getAll();
+ $config = $a->getConfigCache()->getAll();
foreach ($config as $cat => $section) {
if (is_array($section)) {
foreach ($section as $key => $value) {
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
- $php_path = BaseObject::getApp()->getConfig()->get('config', 'php_path', 'php');
+ $php_path = BaseObject::getApp()->getConfigCache()->get('config', 'php_path', 'php');
if ($this->getOption('v')) {
$this->out('Directory: src');
use DOMDocument;
use Exception;
-use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\Cache\IConfigCache;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\Object\Image;
/**
* Checking the Database connection and if it is available for the current installation
*
- * @param ConfigCache $configCache The configuration cache
+ * @param IConfigCache $configCache The configuration cache
* @param Profiler $profiler The profiler of this app
* @param string $dbhost Hostname/IP of the Friendica Database
* @param string $dbuser Username of the Database connection credentials
* @return bool true if the check was successful, otherwise false
* @throws Exception
*/
- public function checkDB(ConfigCache $configCache, Profiler $profiler, $dbhost, $dbuser, $dbpass, $dbdata)
+ public function checkDB(IConfigCache $configCache, Profiler $profiler, $dbhost, $dbuser, $dbpass, $dbdata)
{
if (!DBA::connect($configCache, $profiler, $dbhost, $dbuser, $dbpass, $dbdata)) {
$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
class PConfig
{
/**
- * @var Config\IPConfigAdapter
+ * @var Config\PConfiguration
*/
- private static $adapter;
-
- /**
- * @var Config\IPConfigCache
- */
- private static $cache;
+ private static $config;
/**
* Initialize the config with only the cache
*
- * @param Config\IPConfigCache $cache The configuration cache
- */
- public static function init(Config\IPConfigCache $cache)
- {
- self::$cache = $cache;
- }
-
- /**
- * Add the adapter for DB-backend
- *
- * @param Config\IPConfigAdapter $adapter
+ * @param Config\PConfiguration $config The configuration cache
*/
- public static function setAdapter(Config\IPConfigAdapter $adapter)
+ public static function init(Config\PConfiguration $config)
{
- self::$adapter = $adapter;
+ self::$config = $config;
}
/**
* @brief Loads all configuration values of a user's config family into a cached storage.
*
- * All configuration values of the given user are stored with the $uid in
- * the cache ( @see IPConfigCache )
- *
- * @param string $uid The user_id
- * @param string $family The category of the configuration value
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
*
* @return void
*/
- public static function load($uid, $family)
+ public static function load($uid, $cat)
{
- if (!isset(self::$adapter)) {
- return;
- }
-
- self::$adapter->load($uid, $family);
+ self::$config->load($uid, $cat);
}
/**
* @brief Get a particular user's config variable given the category name
- * ($family) and a key.
- *
- * Get a particular user's config value from the given category ($family)
- * and the $key with the $uid from a cached storage either from the self::$adapter
- * (@see IConfigAdapter ) or from the static::$cache (@see IConfigCache ).
+ * ($cat) and a key.
*
* @param string $uid The user_id
- * @param string $family The category of the configuration value
+ * @param string $cat The category of the configuration value
* @param string $key The configuration key to query
* @param mixed $default_value optional, The value to return if key is not set (default: null)
* @param boolean $refresh optional, If true the config is loaded from the db and not from the cache (default: false)
*
* @return mixed Stored value or null if it does not exist
*/
- public static function get($uid, $family, $key, $default_value = null, $refresh = false)
+ public static function get($uid, $cat, $key, $default_value = null, $refresh = false)
{
- if (!isset(self::$adapter)) {
- return self::$cache->getP($uid, $family, $key, $default_value);
- }
-
- return self::$adapter->get($uid, $family, $key, $default_value, $refresh);
+ return self::$config->get($uid, $cat, $key, $default_value, $refresh);
}
/**
* @brief Sets a configuration value for a user
*
- * Stores a config value ($value) in the category ($family) under the key ($key)
- * for the user_id $uid.
- *
* @note Please do not store booleans - convert to 0/1 integer values!
*
* @param string $uid The user_id
- * @param string $family The category of the configuration value
+ * @param string $cat The category of the configuration value
* @param string $key The configuration key to set
* @param mixed $value The value to store
*
* @return bool Operation success
*/
- public static function set($uid, $family, $key, $value)
+ public static function set($uid, $cat, $key, $value)
{
- if (!isset(self::$adapter)) {
- return self::$cache->setP($uid, $family, $key, $value);
- }
-
- return self::$adapter->set($uid, $family, $key, $value);
+ return self::$config->set($uid, $cat, $key, $value);
}
/**
* @brief Deletes the given key from the users's configuration.
*
- * Removes the configured value from the stored cache in self::$config
- * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter )
- * with the given $uid.
- *
- * @param string $uid The user_id
- * @param string $family The category of the configuration value
- * @param string $key The configuration key to delete
+ * @param string $uid The user_id
+ * @param string $cat The category of the configuration value
+ * @param string $key The configuration key to delete
*
- * @return mixed
+ * @return bool
*/
- public static function delete($uid, $family, $key)
+ public static function delete($uid, $cat, $key)
{
- if (!isset(self::$adapter)) {
- return self::$cache->deleteP($uid, $family, $key);
- }
-
- return self::$adapter->delete($uid, $family, $key);
+ return self::$config->delete($uid, $cat, $key);
}
}
namespace Friendica\Database;
-use Friendica\Core\Config\IConfigCache;
+use Friendica\Core\Config\Cache\IConfigCache;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Util\DateTimeFormat;
namespace Friendica\Factory;
+use Friendica\Core;
use Friendica\Core\Config;
+use Friendica\Core\Config\Adapter;
+use Friendica\Core\Config\Cache;
class ConfigFactory
{
/**
- * @param Config\ConfigCacheLoader $loader The Config Cache loader (INI/config/.htconfig)
+ * @param Cache\ConfigCacheLoader $loader The Config Cache loader (INI/config/.htconfig)
*
- * @return Config\ConfigCache
+ * @return Cache\ConfigCache
*/
- public static function createCache(Config\ConfigCacheLoader $loader)
+ public static function createCache(Cache\ConfigCacheLoader $loader)
{
- $configCache = new Config\ConfigCache();
+ $configCache = new Cache\ConfigCache();
$loader->loadConfigFiles($configCache);
return $configCache;
}
/**
- * @param string $type The adapter type
- * @param Config\IConfigCache $config The config cache of this adapter
+ * @param Cache\ConfigCache $configCache The config cache of this adapter
*
- * @return Config\IConfigAdapter
+ * @return Config\Configuration
*/
- public static function createConfig($type, Config\IConfigCache $config)
+ public static function createConfig(Cache\ConfigCache $configCache)
{
- if ($type == 'preload') {
- return new Config\PreloadConfigAdapter($config);
+ if ($configCache->get('system', 'config_adapter') === 'preload') {
+ $configAdapter = new Adapter\PreloadConfigAdapter();
} else {
- return new Config\JITConfigAdapter($config);
+ $configAdapter = new Adapter\JITConfigAdapter();
}
+
+ $configuration = new Config\Configuration($configCache, $configAdapter);
+
+ // Set the config in the static container for legacy usage
+ Core\Config::init($configuration);
+
+ return $configuration;
}
/**
- * @param string $type The adapter type
- * @param Config\IPConfigCache $config The config cache of this adapter
- * @param int $uid The UID of the current user
+ * @param Cache\ConfigCache $configCache The config cache of this adapter
+ * @param int $uid The UID of the current user
*
- * @return Config\IPConfigAdapter
+ * @return Config\PConfiguration
*/
- public static function createPConfig($type, Config\IPConfigCache $config, $uid = null)
+ public static function createPConfig(Cache\ConfigCache $configCache, $uid = null)
{
- if ($type == 'preload') {
- return new Config\PreloadPConfigAdapter($config, $uid);
+ if ($configCache->get('system', 'config_adapter') === 'preload') {
+ $configAdapter = new Adapter\PreloadPConfigAdapter($uid);
} else {
- return new Config\JITPConfigAdapter($config);
+ $configAdapter = new Adapter\JITPConfigAdapter();
}
+
+ $configuration = new Config\PConfiguration($configCache, $configAdapter);
+
+ // Set the config in the static container for legacy usage
+ Core\PConfig::init($configuration);
+
+ return $configuration;
}
}
--- /dev/null
+<?php
+
+namespace Friendica\Factory;
+
+use Friendica\Core\Config\Cache;
+use Friendica\Database;
+
+class DBFactory
+{
+ public static function init(Cache\ConfigCache $configCache, array $server)
+ {
+ if (Database\DBA::connected()) {
+ return;
+ }
+
+ $db_host = $configCache->get('database', 'hostname');
+ $db_user = $configCache->get('database', 'username');
+ $db_pass = $configCache->get('database', 'password');
+ $db_data = $configCache->get('database', 'database');
+ $charset = $configCache->get('database', 'charset');
+
+ // Use environment variables for mysql if they are set beforehand
+ if (!empty($server['MYSQL_HOST'])
+ && !empty($server['MYSQL_USERNAME'] || !empty($server['MYSQL_USER']))
+ && $server['MYSQL_PASSWORD'] !== false
+ && !empty($server['MYSQL_DATABASE']))
+ {
+ $db_host = $server['MYSQL_HOST'];
+ if (!empty($server['MYSQL_PORT'])) {
+ $db_host .= ':' . $server['MYSQL_PORT'];
+ }
+ if (!empty($server['MYSQL_USERNAME'])) {
+ $db_user = $server['MYSQL_USERNAME'];
+ } else {
+ $db_user = $server['MYSQL_USER'];
+ }
+ $db_pass = (string) $server['MYSQL_PASSWORD'];
+ $db_data = $server['MYSQL_DATABASE'];
+ }
+
+ if (Database\DBA::connect($configCache, $db_host, $db_user, $db_pass, $db_data, $charset)) {
+ // Loads DB_UPDATE_VERSION constant
+ Database\DBStructure::definition($configCache->get('system', 'basepath'), false);
+ }
+
+ unset($db_host, $db_user, $db_pass, $db_data, $charset);
+ }
+}
namespace Friendica\Factory;
-use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\Configuration;
use Friendica\Core\Logger;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\Logger\FriendicaDevelopHandler;
/**
* Creates a new PSR-3 compliant logger instances
*
- * @param string $channel The channel of the logger instance
- * @param ConfigCache $config The config
+ * @param string $channel The channel of the logger instance
+ * @param Configuration $config The config
*
* @return LoggerInterface The PSR-3 compliant logger instance
*/
- public static function create($channel, ConfigCache $config = null)
+ public static function create($channel, Configuration $config)
{
$logger = new Monolog\Logger($channel);
$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
$dbdata = Strings::escapeTags(trim(defaults($_POST, 'dbdata', '')));
// If we cannot connect to the database, return to the previous step
- if (!self::$installer->checkDB($a->getConfig(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
+ if (!self::$installer->checkDB($a->getConfigCache(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
self::$currentWizardStep = self::DATABASE_CONFIG;
}
$adminmail = Strings::escapeTags(trim(defaults($_POST, 'adminmail', '')));
// If we cannot connect to the database, return to the Database config wizard
- if (!self::$installer->checkDB($a->getConfig(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
+ if (!self::$installer->checkDB($a->getConfigCache(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
self::$currentWizardStep = self::DATABASE_CONFIG;
return;
}
namespace Friendica\Test;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
use Friendica\Database\DBA;
use Friendica\Factory;
use Friendica\Util\BasePath;
}
$basedir = BasePath::create(dirname(__DIR__));
- $configLoader = new Config\ConfigCacheLoader($basedir);
+ $configLoader = new Cache\ConfigCacheLoader($basedir);
$config = Factory\ConfigFactory::createCache($configLoader);
$profiler = \Mockery::mock(Profiler::class);
use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Config;
-use Friendica\Core\Config\ConfigCache;
use Friendica\Render\FriendicaSmartyEngine;
use Mockery\MockInterface;
use org\bovigo\vfs\vfsStreamDirectory;
protected $app;
/**
- * @var MockInterface|ConfigCache The mocked Config Cache
+ * @var MockInterface|Config\Configuration The mocked Config Cache
*/
protected $configCache;
* Mock the App
*
* @param vfsStreamDirectory $root The root directory
- * @param MockInterface|ConfigCache $config The config cache
+ * @param MockInterface|Config\Configuration $config The config cache
*/
- public function mockApp($root, $config)
+ public function mockApp($root, Config\Configuration $config)
{
$this->configCache = $config;
// Mocking App and most used functions
->andReturn('localhost');
$config
->shouldReceive('get')
- ->with('system', 'theme', NULL)
+ ->with('system', 'theme', NULL, false)
->andReturn('system_theme');
+ $config
+ ->shouldReceive('getConfig')
+ ->andReturn($config);
$this->app
- ->shouldReceive('getConfig')
+ ->shouldReceive('getConfigCache')
->andReturn($config);
$this->app
// Initialize empty Config
Config::init($config);
- $configAdapter = \Mockery::mock('Friendica\Core\Config\IConfigAdapter');
- $configAdapter
- ->shouldReceive('isConnected')
- ->andReturn(false);
- Config::setAdapter($configAdapter);
BaseObject::setApp($this->app);
}
use Friendica\App;
use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System;
public function setUp()
{
$basedir = BasePath::create(dirname(__DIR__) . '/../');
- $configLoader = new Config\ConfigCacheLoader($basedir);
- $config = Factory\ConfigFactory::createCache($configLoader);
+ $configLoader = new Cache\ConfigCacheLoader($basedir);
+ $configCache = Factory\ConfigFactory::createCache($configLoader);
+ Factory\DBFactory::init($configCache, $_SERVER);
+ $config = Factory\ConfigFactory::createConfig($configCache);
+ $pconfig = Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('test', $config);
$profiler = Factory\ProfilerFactory::create($logger, $config);
$this->app = new App($config, $logger, $profiler, false);
$this->mockConnected(true, 1);
$this->mockFetchFirst('SHOW TABLES LIKE \'config\'', true, 1);
- $config = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+ $config = \Mockery::mock('Friendica\Core\Config\Configuration');
$config
->shouldReceive('get')
- ->with('system', 'maintenance', null)
+ ->with('system', 'maintenance', null, false)
->andReturn(true)
->once();
// Initialize empty Config
Config::init($config);
- $configAdapter = \Mockery::mock('Friendica\Core\Config\IConfigAdapter');
- $configAdapter
- ->shouldReceive('isConnected')
- ->andReturn(false);
- Config::setAdapter($configAdapter);
$mode = new Mode($this->root->url());
$mode->determine();
$this->mockConnected(true, 1);
$this->mockFetchFirst('SHOW TABLES LIKE \'config\'', true, 1);
- $config = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+ $config = \Mockery::mock('Friendica\Core\Config\Configuration');
$config
->shouldReceive('get')
- ->with('system', 'maintenance', null)
+ ->with('system', 'maintenance', null, false)
->andReturn(false)
->once();
// Initialize empty Config
Config::init($config);
- $configAdapter = \Mockery::mock('Friendica\Core\Config\IConfigAdapter');
- $configAdapter
- ->shouldReceive('isConnected')
- ->andReturn(false);
- Config::setAdapter($configAdapter);
$mode = new Mode($this->root->url());
$mode->determine();
{
$baseObject = new BaseObject();
$this->setUpVfsDir();
- $configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+ $configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
$this->mockApp($this->root, $configMock);
$this->assertNull($baseObject->setApp($this->app));
protected function setUp()
{
$this->setUpVfsDir();
- $configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+ $configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
$this->mockApp($this->root, $configMock);
$this->app
->shouldReceive('getHostname')
{
$this->configCache
->shouldReceive('get')
- ->with('system', 'memcache_host', NULL)
+ ->with('system', 'memcache_host', NULL, false)
->andReturn('localhost');
$this->configCache
->shouldReceive('get')
- ->with('system', 'memcache_port', NULL)
+ ->with('system', 'memcache_port', NULL, false)
->andReturn(11211);
$this->cache = CacheDriverFactory::create('memcache');
{
$this->configCache
->shouldReceive('get')
- ->with('system', 'memcached_hosts', NULL)
+ ->with('system', 'memcached_hosts', NULL, false)
->andReturn([0 => 'localhost, 11211']);
$this->cache = CacheDriverFactory::create('memcached');
{
$this->configCache
->shouldReceive('get')
- ->with('system', 'redis_host', NULL)
+ ->with('system', 'redis_host', NULL, false)
->andReturn('localhost');
$this->configCache
->shouldReceive('get')
- ->with('system', 'redis_port', NULL)
+ ->with('system', 'redis_port', NULL, false)
->andReturn(null);
$this->cache = CacheDriverFactory::create('redis');
--- /dev/null
+<?php
+
+namespace Friendica\Test\Core\Config\Cache;
+
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Cache\ConfigCacheLoader;
+use Friendica\Test\MockedTest;
+use Friendica\Test\Util\VFSTrait;
+use org\bovigo\vfs\vfsStream;
+
+class ConfigCacheLoaderTest extends MockedTest
+{
+ use VFSTrait;
+
+ protected function setUp()
+ {
+ parent::setUp();
+
+ $this->setUpVfsDir();
+ }
+
+ /**
+ * Test the loadConfigFiles() method with default values
+ */
+ public function testLoadConfigFiles()
+ {
+ $configCacheLoader = new ConfigCacheLoader($this->root->url());
+ $configCache = new ConfigCache();
+
+ $configCacheLoader->loadConfigFiles($configCache);
+
+ $this->assertEquals($this->root->url(), $configCache->get('system', 'basepath'));
+ }
+
+ /**
+ * Test the loadConfigFiles() method with a wrong local.config.php
+ * @expectedException \Exception
+ * @expectedExceptionMessageRegExp /Error loading config file \w+/
+ */
+ public function testLoadConfigWrong()
+ {
+ $this->delConfigFile('local.config.php');
+
+ vfsStream::newFile('local.config.php')
+ ->at($this->root->getChild('config'))
+ ->setContent('<?php return true;');
+
+ $configCacheLoader = new ConfigCacheLoader($this->root->url());
+ $configCache = new ConfigCache();
+
+ $configCacheLoader->loadConfigFiles($configCache);
+ }
+
+ /**
+ * Test the loadConfigFiles() method with a local.config.php file
+ */
+ public function testLoadConfigFilesLocal()
+ {
+ $this->delConfigFile('local.config.php');
+
+ $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ 'datasets' . DIRECTORY_SEPARATOR .
+ 'config' . DIRECTORY_SEPARATOR .
+ 'local.config.php';
+
+ vfsStream::newFile('local.config.php')
+ ->at($this->root->getChild('config'))
+ ->setContent(file_get_contents($file));
+
+ $configCacheLoader = new ConfigCacheLoader($this->root->url());
+ $configCache = new ConfigCache();
+
+ $configCacheLoader->loadConfigFiles($configCache);
+
+ $this->assertEquals('testhost', $configCache->get('database', 'hostname'));
+ $this->assertEquals('testuser', $configCache->get('database', 'username'));
+ $this->assertEquals('testpw', $configCache->get('database', 'password'));
+ $this->assertEquals('testdb', $configCache->get('database', 'database'));
+
+ $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
+ $this->assertEquals('Friendica Social Network', $configCache->get('config', 'sitename'));
+ }
+
+ /**
+ * Test the loadConfigFile() method with a local.ini.php file
+ */
+ public function testLoadConfigFilesINI()
+ {
+ $this->delConfigFile('local.config.php');
+
+ $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ 'datasets' . DIRECTORY_SEPARATOR .
+ 'config' . DIRECTORY_SEPARATOR .
+ 'local.ini.php';
+
+ vfsStream::newFile('local.ini.php')
+ ->at($this->root->getChild('config'))
+ ->setContent(file_get_contents($file));
+
+ $configCacheLoader = new ConfigCacheLoader($this->root->url());
+ $configCache = new ConfigCache();
+
+ $configCacheLoader->loadConfigFiles($configCache);
+
+ $this->assertEquals('testhost', $configCache->get('database', 'hostname'));
+ $this->assertEquals('testuser', $configCache->get('database', 'username'));
+ $this->assertEquals('testpw', $configCache->get('database', 'password'));
+ $this->assertEquals('testdb', $configCache->get('database', 'database'));
+
+ $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
+ }
+
+ /**
+ * Test the loadConfigFile() method with a .htconfig.php file
+ */
+ public function testLoadConfigFilesHtconfig()
+ {
+ $this->delConfigFile('local.config.php');
+
+ $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ 'datasets' . DIRECTORY_SEPARATOR .
+ 'config' . DIRECTORY_SEPARATOR .
+ '.htconfig.test.php';
+
+ vfsStream::newFile('.htconfig.php')
+ ->at($this->root)
+ ->setContent(file_get_contents($file));
+
+ $configCacheLoader = new ConfigCacheLoader($this->root->url());
+ $configCache = new ConfigCache();
+
+ $configCacheLoader->loadConfigFiles($configCache);
+
+ $this->assertEquals('testhost', $configCache->get('database', 'hostname'));
+ $this->assertEquals('testuser', $configCache->get('database', 'username'));
+ $this->assertEquals('testpw', $configCache->get('database', 'password'));
+ $this->assertEquals('testdb', $configCache->get('database', 'database'));
+
+ $this->assertEquals('/var/run/friendica.pid', $configCache->get('system', 'pidfile'));
+ $this->assertEquals('Europe/Berlin', $configCache->get('system', 'default_timezone'));
+ $this->assertEquals('fr', $configCache->get('system', 'language'));
+ }
+
+ public function testLoadAddonConfig()
+ {
+ $structure = [
+ 'addon' => [
+ 'test' => [
+ 'config' => [],
+ ],
+ ],
+ ];
+
+ vfsStream::create($structure, $this->root);
+
+ $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ 'datasets' . DIRECTORY_SEPARATOR .
+ 'config' . DIRECTORY_SEPARATOR .
+ 'local.config.php';
+
+ vfsStream::newFile('test.config.php')
+ ->at($this->root->getChild('addon')->getChild('test')->getChild('config'))
+ ->setContent(file_get_contents($file));
+
+ $configCacheLoader = new ConfigCacheLoader($this->root->url());
+
+ $conf = $configCacheLoader->loadAddonConfig('test');
+
+ $this->assertEquals('testhost', $conf['database']['hostname']);
+ $this->assertEquals('testuser', $conf['database']['username']);
+ $this->assertEquals('testpw', $conf['database']['password']);
+ $this->assertEquals('testdb', $conf['database']['database']);
+
+ $this->assertEquals('admin@test.it', $conf['config']['admin_email']);
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Test\Core\Config\Cache;
+
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Test\MockedTest;
+
+class ConfigCacheTest extends MockedTest
+{
+ public function dataTests()
+ {
+ return [
+ 'normal' => [
+ 'data' => [
+ 'system' => [
+ 'test' => 'it',
+ 'boolTrue' => true,
+ 'boolFalse' => false,
+ 'int' => 235,
+ 'dec' => 2.456,
+ 'array' => ['1', 2, '3', true, false],
+ ],
+ 'config' => [
+ 'a' => 'value',
+ ],
+ ]
+ ]
+ ];
+ }
+
+ private function assertConfigValues($data, ConfigCache $configCache, $uid = null)
+ {
+ foreach ($data as $cat => $values) {
+ foreach ($values as $key => $value) {
+ if (isset($uid)) {
+ $this->assertEquals($data[$cat][$key], $configCache->getP($uid, $cat, $key));
+ } else {
+ $this->assertEquals($data[$cat][$key], $configCache->get($cat, $key));
+ }
+ }
+ }
+ }
+
+ /**
+ * Test the loadConfigArray() method without override
+ * @dataProvider dataTests
+ */
+ public function testLoadConfigArray($data)
+ {
+ $configCache = new ConfigCache();
+ $configCache->load($data);
+
+ $this->assertConfigValues($data, $configCache);
+ }
+
+ /**
+ * Test the loadConfigArray() method with overrides
+ * @dataProvider dataTests
+ */
+ public function testLoadConfigArrayOverride($data)
+ {
+ $override = [
+ 'system' => [
+ 'test' => 'not',
+ 'boolTrue' => false,
+ ]
+ ];
+
+ $configCache = new ConfigCache();
+ $configCache->load($data);
+ $configCache->load($override);
+
+ $this->assertConfigValues($data, $configCache);
+
+ // override the value
+ $configCache->load($override, true);
+
+ $this->assertEquals($override['system']['test'], $configCache->get('system', 'test'));
+ $this->assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
+ }
+
+ /**
+ * Test the loadConfigArray() method with wrong/empty datasets
+ */
+ public function testLoadConfigArrayWrong()
+ {
+ $configCache = new ConfigCache();
+
+ // empty dataset
+ $configCache->load([]);
+ $this->assertEmpty($configCache->getAll());
+
+ // wrong dataset
+ $configCache->load(['system' => 'not_array']);
+ $this->assertEmpty($configCache->getAll());
+
+ // incomplete dataset (key is integer ID of the array)
+ $configCache->load(['system' => ['value']]);
+ $this->assertEquals('value', $configCache->get('system', 0));
+ }
+
+ /**
+ * Test the getAll() method
+ * @dataProvider dataTests
+ */
+ public function testGetAll($data)
+ {
+ $configCache = new ConfigCache();
+ $configCache->load($data);
+
+ $all = $configCache->getAll();
+
+ $this->assertContains($data['system'], $all);
+ $this->assertContains($data['config'], $all);
+ }
+
+ /**
+ * Test the set() and get() method
+ * @dataProvider dataTests
+ */
+ public function testSetGet($data)
+ {
+ $configCache = new ConfigCache();
+
+ foreach ($data as $cat => $values) {
+ foreach ($values as $key => $value) {
+ $configCache->set($cat, $key, $value);
+ }
+ }
+
+ $this->assertConfigValues($data, $configCache);
+ }
+
+ /**
+ * Test the get() method without a value
+ */
+ public function testGetEmpty()
+ {
+ $configCache = new ConfigCache();
+
+ $this->assertEquals('!<unset>!', $configCache->get('something', 'value'));
+ }
+
+ /**
+ * Test the has() method
+ */
+ public function testHas()
+ {
+ $configCache = new ConfigCache();
+
+ $this->assertFalse($configCache->has('system', 'test'));
+
+ $configCache->set('system', 'test', 'it');
+ $this->assertTrue($configCache->has('system', 'test'));
+
+ $this->assertFalse($configCache->has('system', null));
+ $configCache->set('system', null, 'it');
+ $this->assertTrue($configCache->has('system', null));
+ }
+
+ /**
+ * Test the delete() method
+ * @dataProvider dataTests
+ */
+ public function testDelete($data)
+ {
+ $configCache = new ConfigCache($data);
+
+ foreach ($data as $cat => $values) {
+ foreach ($values as $key => $value) {
+ $configCache->delete($cat, $key);
+ }
+ }
+
+ $this->assertEmpty($configCache->getAll());
+ }
+
+ /**
+ * Test the setP() and getP() methods
+ * @dataProvider dataTests
+ */
+ public function testSetGetP($data)
+ {
+ $configCache = new ConfigCache();
+ $uid = 345;
+
+ foreach ($data as $cat => $values) {
+ foreach ($values as $key => $value) {
+ $configCache->setP($uid, $cat, $key, $value);
+ }
+ }
+
+ $this->assertConfigValues($data, $configCache, $uid);
+ }
+
+
+ /**
+ * Test the deleteP() method
+ * @dataProvider dataTests
+ */
+ public function testDeleteP($data)
+ {
+ $configCache = new ConfigCache();
+ $uid = 345;
+
+ foreach ($data as $cat => $values) {
+ foreach ($values as $key => $value) {
+ $configCache->setP($uid, $cat, $key, $value);
+ }
+ }
+
+ foreach ($data as $cat => $values) {
+ foreach ($values as $key => $value) {
+ $configCache->deleteP($uid, $cat, $key);
+ }
+ }
+
+ $this->assertEmpty($configCache->getAll());
+ }
+
+ /**
+ * Test the hasP() method
+ */
+ public function testHasP()
+ {
+ $configCache = new ConfigCache();
+ $uid = 345;
+
+ $this->assertFalse($configCache->hasP($uid, 'system', 'test'));
+
+ $configCache->setP($uid, 'system', 'test', 'it');
+ $this->assertTrue($configCache->hasP($uid, 'system', 'test'));
+
+ $this->assertFalse($configCache->hasP($uid, 'system', null));
+ $configCache->setP($uid, 'system', null, 'it');
+ $this->assertTrue($configCache->hasP($uid, 'system', null));
+ }
+}
+++ /dev/null
-<?php
-
-namespace Friendica\Test\Core\Config;
-
-use Friendica\Core\Config\ConfigCache;
-use Friendica\Core\Config\ConfigCacheLoader;
-use Friendica\Test\MockedTest;
-use Friendica\Test\Util\VFSTrait;
-use org\bovigo\vfs\vfsStream;
-
-class ConfigCacheLoaderTest extends MockedTest
-{
- use VFSTrait;
-
- protected function setUp()
- {
- parent::setUp();
-
- $this->setUpVfsDir();
- }
-
- /**
- * Test the loadConfigFiles() method with default values
- */
- public function testLoadConfigFiles()
- {
- $configCacheLoader = new ConfigCacheLoader($this->root->url());
- $configCache = new ConfigCache();
-
- $configCacheLoader->loadConfigFiles($configCache);
-
- $this->assertEquals($this->root->url(), $configCache->get('system', 'basepath'));
- }
-
- /**
- * Test the loadConfigFiles() method with a wrong local.config.php
- * @expectedException \Exception
- * @expectedExceptionMessageRegExp /Error loading config file \w+/
- */
- public function testLoadConfigWrong()
- {
- $this->delConfigFile('local.config.php');
-
- vfsStream::newFile('local.config.php')
- ->at($this->root->getChild('config'))
- ->setContent('<?php return true;');
-
- $configCacheLoader = new ConfigCacheLoader($this->root->url());
- $configCache = new ConfigCache();
-
- $configCacheLoader->loadConfigFiles($configCache);
- }
-
- /**
- * Test the loadConfigFiles() method with a local.config.php file
- */
- public function testLoadConfigFilesLocal()
- {
- $this->delConfigFile('local.config.php');
-
- $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- 'datasets' . DIRECTORY_SEPARATOR .
- 'config' . DIRECTORY_SEPARATOR .
- 'local.config.php';
-
- vfsStream::newFile('local.config.php')
- ->at($this->root->getChild('config'))
- ->setContent(file_get_contents($file));
-
- $configCacheLoader = new ConfigCacheLoader($this->root->url());
- $configCache = new ConfigCache();
-
- $configCacheLoader->loadConfigFiles($configCache);
-
- $this->assertEquals('testhost', $configCache->get('database', 'hostname'));
- $this->assertEquals('testuser', $configCache->get('database', 'username'));
- $this->assertEquals('testpw', $configCache->get('database', 'password'));
- $this->assertEquals('testdb', $configCache->get('database', 'database'));
-
- $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
- $this->assertEquals('Friendica Social Network', $configCache->get('config', 'sitename'));
- }
-
- /**
- * Test the loadConfigFile() method with a local.ini.php file
- */
- public function testLoadConfigFilesINI()
- {
- $this->delConfigFile('local.config.php');
-
- $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- 'datasets' . DIRECTORY_SEPARATOR .
- 'config' . DIRECTORY_SEPARATOR .
- 'local.ini.php';
-
- vfsStream::newFile('local.ini.php')
- ->at($this->root->getChild('config'))
- ->setContent(file_get_contents($file));
-
- $configCacheLoader = new ConfigCacheLoader($this->root->url());
- $configCache = new ConfigCache();
-
- $configCacheLoader->loadConfigFiles($configCache);
-
- $this->assertEquals('testhost', $configCache->get('database', 'hostname'));
- $this->assertEquals('testuser', $configCache->get('database', 'username'));
- $this->assertEquals('testpw', $configCache->get('database', 'password'));
- $this->assertEquals('testdb', $configCache->get('database', 'database'));
-
- $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
- }
-
- /**
- * Test the loadConfigFile() method with a .htconfig.php file
- */
- public function testLoadConfigFilesHtconfig()
- {
- $this->delConfigFile('local.config.php');
-
- $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- 'datasets' . DIRECTORY_SEPARATOR .
- 'config' . DIRECTORY_SEPARATOR .
- '.htconfig.test.php';
-
- vfsStream::newFile('.htconfig.php')
- ->at($this->root)
- ->setContent(file_get_contents($file));
-
- $configCacheLoader = new ConfigCacheLoader($this->root->url());
- $configCache = new ConfigCache();
-
- $configCacheLoader->loadConfigFiles($configCache);
-
- $this->assertEquals('testhost', $configCache->get('database', 'hostname'));
- $this->assertEquals('testuser', $configCache->get('database', 'username'));
- $this->assertEquals('testpw', $configCache->get('database', 'password'));
- $this->assertEquals('testdb', $configCache->get('database', 'database'));
-
- $this->assertEquals('/var/run/friendica.pid', $configCache->get('system', 'pidfile'));
- $this->assertEquals('Europe/Berlin', $configCache->get('system', 'default_timezone'));
- $this->assertEquals('fr', $configCache->get('system', 'language'));
- }
-
- public function testLoadAddonConfig()
- {
- $structure = [
- 'addon' => [
- 'test' => [
- 'config' => [],
- ],
- ],
- ];
-
- vfsStream::create($structure, $this->root);
-
- $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- 'datasets' . DIRECTORY_SEPARATOR .
- 'config' . DIRECTORY_SEPARATOR .
- 'local.config.php';
-
- vfsStream::newFile('test.config.php')
- ->at($this->root->getChild('addon')->getChild('test')->getChild('config'))
- ->setContent(file_get_contents($file));
-
- $configCacheLoader = new ConfigCacheLoader($this->root->url());
-
- $conf = $configCacheLoader->loadAddonConfig('test');
-
- $this->assertEquals('testhost', $conf['database']['hostname']);
- $this->assertEquals('testuser', $conf['database']['username']);
- $this->assertEquals('testpw', $conf['database']['password']);
- $this->assertEquals('testdb', $conf['database']['database']);
-
- $this->assertEquals('admin@test.it', $conf['config']['admin_email']);
- }
-}
+++ /dev/null
-<?php
-
-namespace Friendica\Test\Core\Config;
-
-use Friendica\Core\Config\ConfigCache;
-use Friendica\Test\MockedTest;
-
-class ConfigCacheTest extends MockedTest
-{
- public function dataTests()
- {
- return [
- 'normal' => [
- 'data' => [
- 'system' => [
- 'test' => 'it',
- 'boolTrue' => true,
- 'boolFalse' => false,
- 'int' => 235,
- 'dec' => 2.456,
- 'array' => ['1', 2, '3', true, false],
- ],
- 'config' => [
- 'a' => 'value',
- ],
- ]
- ]
- ];
- }
-
- private function assertConfigValues($data, ConfigCache $configCache, $uid = null)
- {
- foreach ($data as $cat => $values) {
- foreach ($values as $key => $value) {
- if (isset($uid)) {
- $this->assertEquals($data[$cat][$key], $configCache->getP($uid, $cat, $key));
- } else {
- $this->assertEquals($data[$cat][$key], $configCache->get($cat, $key));
- }
- }
- }
- }
-
- /**
- * Test the loadConfigArray() method without override
- * @dataProvider dataTests
- */
- public function testLoadConfigArray($data)
- {
- $configCache = new ConfigCache();
- $configCache->loadConfigArray($data);
-
- $this->assertConfigValues($data, $configCache);
- }
-
- /**
- * Test the loadConfigArray() method with overrides
- * @dataProvider dataTests
- */
- public function testLoadConfigArrayOverride($data)
- {
- $override = [
- 'system' => [
- 'test' => 'not',
- 'boolTrue' => false,
- ]
- ];
-
- $configCache = new ConfigCache();
- $configCache->loadConfigArray($data);
- $configCache->loadConfigArray($override);
-
- $this->assertConfigValues($data, $configCache);
-
- // override the value
- $configCache->loadConfigArray($override, true);
-
- $this->assertEquals($override['system']['test'], $configCache->get('system', 'test'));
- $this->assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
- }
-
- /**
- * Test the getAll() method
- * @dataProvider dataTests
- */
- public function testGetAll($data)
- {
- $configCache = new ConfigCache();
- $configCache->loadConfigArray($data);
-
- $all = $configCache->getAll();
-
- $this->assertContains($data['system'], $all);
-
- // config values are stored directly in the array base
- $this->assertEquals($data['config']['a'], $all['a']);
- }
-
- /**
- * Test the set() and get() method
- * @dataProvider dataTests
- */
- public function testSetGet($data)
- {
- $configCache = new ConfigCache();
-
- foreach ($data as $cat => $values) {
- foreach ($values as $key => $value) {
- $configCache->set($cat, $key, $value);
- }
- }
-
- $this->assertConfigValues($data, $configCache);
- }
-
- /**
- * Test the delete() method
- * @dataProvider dataTests
- */
- public function testDelete($data)
- {
- $configCache = new ConfigCache($data);
-
- foreach ($data as $cat => $values) {
- foreach ($values as $key => $value) {
- $configCache->delete($cat, $key);
- }
- }
-
- $this->assertEmpty($configCache->getAll());
- }
-
- /**
- * Test the setP() and getP() methods
- * @dataProvider dataTests
- */
- public function testSetGetP($data)
- {
- $configCache = new ConfigCache();
- $uid = 345;
-
- foreach ($data as $cat => $values) {
- foreach ($values as $key => $value) {
- $configCache->setP($uid, $cat, $key, $value);
- }
- }
-
- $this->assertConfigValues($data, $configCache, $uid);
- }
-
-
- /**
- * Test the deleteP() method
- * @dataProvider dataTests
- */
- public function testDeleteP($data)
- {
- $configCache = new ConfigCache();
- $uid = 345;
-
- foreach ($data as $cat => $values) {
- foreach ($values as $key => $value) {
- $configCache->setP($uid, $cat, $key, $value);
- }
- }
-
- foreach ($data as $cat => $values) {
- foreach ($values as $key => $value) {
- $configCache->deleteP($uid, $cat, $key);
- }
- }
-
- $this->assertEmpty($configCache->getAll());
- }
-}
--- /dev/null
+<?php
+
+namespace Friendica\Test\Core\Config;
+
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Cache\IConfigCache;
+use Friendica\Core\Config\Configuration;
+use Friendica\Test\MockedTest;
+
+class ConfigurationTest extends MockedTest
+{
+ /**
+ * Test the configuration initialization
+ */
+ public function testSetUp()
+ {
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(false)->once();
+
+ $configuration = new Configuration($configCache, $configAdapter);
+
+ $this->assertInstanceOf(IConfigCache::class, $configuration->getCache());
+ }
+
+ /**
+ * Test if the configuration load() method
+ */
+ public function testCacheLoad()
+ {
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
+ // constructor loading
+ $configAdapter->shouldReceive('load')->andReturn([])->once();
+ // expected loading
+ $configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+
+ $configuration = new Configuration($configCache, $configAdapter);
+ $configuration->load('testing');
+
+ $this->assertEquals('it', $configuration->get('testing', 'test'));
+ $this->assertEquals('it', $configuration->getCache()->get('testing', 'test'));
+ }
+
+ /**
+ * Test if the configuration load() method with overwrite
+ */
+ public function testCacheLoadDouble()
+ {
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+ // constructor loading
+ $configAdapter->shouldReceive('load')->andReturn([])->once();
+ // expected loading
+ $configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+ // expected next loading
+ $configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'again']])->once();
+
+ $configuration = new Configuration($configCache, $configAdapter);
+ $configuration->load('testing');
+
+ $this->assertEquals('it', $configuration->get('testing', 'test'));
+ $this->assertEquals('it', $configuration->getCache()->get('testing', 'test'));
+
+ $configuration->load('testing');
+
+ $this->assertEquals('again', $configuration->get('testing', 'test'));
+ $this->assertEquals('again', $configuration->getCache()->get('testing', 'test'));
+ }
+
+ /**
+ * Test if the configuration get() and set() methods without adapter
+ */
+ public function testSetGetWithoutDB()
+ {
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(false)->twice();
+
+ $configuration = new Configuration($configCache, $configAdapter);
+
+ $this->assertTrue($configuration->set('test', 'it', 'now'));
+
+ $this->assertEquals('now', $configuration->get('test', 'it'));
+ $this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+ }
+
+ /**
+ * Test if the configuration get() and set() methods with adapter
+ */
+ public function testSetGetWithDB()
+ {
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
+ // constructor loading
+ $configAdapter->shouldReceive('load')->andReturn([])->once();
+ $configAdapter->shouldReceive('set')->with('test', 'it', 'now')->andReturn(true)->once();
+
+ $configuration = new Configuration($configCache, $configAdapter);
+
+ $this->assertTrue($configuration->set('test', 'it', 'now'));
+
+ $this->assertEquals('now', $configuration->get('test', 'it'));
+ $this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+ }
+
+ /**
+ * Test the configuration get() method with wrong value and no db
+ */
+ public function testGetWrongWithoutDB()
+ {
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(false)->times(4);
+
+ $configuration = new Configuration($configCache, $configAdapter);
+
+ // without refresh
+ $this->assertNull($configuration->get('test', 'it'));
+
+ /// beware that the cache returns '!<unset>!' and not null for a non existing value
+ $this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'it'));
+
+ // with default value
+ $this->assertEquals('default', $configuration->get('test', 'it', 'default'));
+
+ // with default value and refresh
+ $this->assertEquals('default', $configuration->get('test', 'it', 'default', true));
+ }
+
+ /**
+ * Test the configuration get() method with refresh
+ */
+ public function testGetWithRefresh()
+ {
+ $configCache = new ConfigCache(['test' => ['it' => 'now']]);
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+ // constructor loading
+ $configAdapter->shouldReceive('load')->andReturn([])->once();
+ $configAdapter->shouldReceive('get')->with('test', 'it')->andReturn('again')->once();
+ $configAdapter->shouldReceive('get')->with('test', 'not')->andReturn('!<unset>!')->once();
+
+ $configuration = new Configuration($configCache, $configAdapter);
+
+ // without refresh
+ $this->assertEquals('now', $configuration->get('test', 'it'));
+ $this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+
+ // with refresh
+ $this->assertEquals('again', $configuration->get('test', 'it', null, true));
+ $this->assertEquals('again', $configuration->getCache()->get('test', 'it'));
+
+ // without refresh and wrong value and default
+ $this->assertEquals('default', $configuration->get('test', 'not', 'default'));
+ $this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'not'));
+ }
+
+ /**
+ * Test the configuration delete() method without adapter
+ */
+ public function testDeleteWithoutDB()
+ {
+ $configCache = new ConfigCache(['test' => ['it' => 'now']]);
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
+
+ $configuration = new Configuration($configCache, $configAdapter);
+
+ $this->assertEquals('now', $configuration->get('test', 'it'));
+ $this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+
+ $this->assertTrue($configuration->delete('test', 'it'));
+ $this->assertNull($configuration->get('test', 'it'));
+ $this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'it'));
+
+ $this->assertEmpty($configuration->getCache()->getAll());
+ }
+
+ /**
+ * Test the configuration delete() method with adapter
+ */
+ public function testDeleteWithDB()
+ {
+ $configCache = new ConfigCache(['test' => ['it' => 'now', 'quarter' => 'true']]);
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(5);
+ // constructor loading
+ $configAdapter->shouldReceive('load')->andReturn([])->once();
+ $configAdapter->shouldReceive('delete')->with('test', 'it')->andReturn(false)->once();
+
+ $configAdapter->shouldReceive('delete')->with('test', 'second')->andReturn(true)->once();
+ $configAdapter->shouldReceive('delete')->with('test', 'third')->andReturn(false)->once();
+ $configAdapter->shouldReceive('delete')->with('test', 'quarter')->andReturn(true)->once();
+
+ $configuration = new Configuration($configCache, $configAdapter);
+
+ $this->assertEquals('now', $configuration->get('test', 'it'));
+ $this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+
+ // delete from cache only
+ $this->assertTrue($configuration->delete('test', 'it'));
+ // delete from db only
+ $this->assertTrue($configuration->delete('test', 'second'));
+ // no delete
+ $this->assertFalse($configuration->delete('test', 'third'));
+ // delete both
+ $this->assertTrue($configuration->delete('test', 'quarter'));
+
+ $this->assertEmpty($configuration->getCache()->getAll());
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Test\Core\Config;
+
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\PConfiguration;
+use Friendica\Test\MockedTest;
+
+class PConfigurationTest extends MockedTest
+{
+ /**
+ * Test if the configuration load() method
+ */
+ public function testCacheLoad()
+ {
+ $uid = 234;
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->once();
+ // expected loading
+ $configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+
+ $configuration = new PConfiguration($configCache, $configAdapter);
+ $configuration->load($uid, 'testing');
+
+ $this->assertEquals('it', $configuration->get($uid, 'testing', 'test'));
+ }
+
+ /**
+ * Test if the configuration load() method with overwrite
+ */
+ public function testCacheLoadDouble()
+ {
+ $uid = 234;
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
+ // expected loading
+ $configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+ // expected next loading
+ $configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'again']])->once();
+
+ $configuration = new PConfiguration($configCache, $configAdapter);
+ $configuration->load($uid, 'testing');
+
+ $this->assertEquals('it', $configuration->get($uid, 'testing', 'test'));
+
+ $configuration->load($uid, 'testing');
+
+ $this->assertEquals('again', $configuration->get($uid, 'testing', 'test'));
+ }
+
+ /**
+ * Test if the configuration get() and set() methods without adapter
+ */
+ public function testSetGetWithoutDB()
+ {
+ $uid = 234;
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(false)->once();
+
+ $configuration = new PConfiguration($configCache, $configAdapter);
+
+ $this->assertTrue($configuration->set($uid, 'test', 'it', 'now'));
+
+ $this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+ }
+
+ /**
+ * Test if the configuration get() and set() methods with adapter
+ */
+ public function testSetGetWithDB()
+ {
+ $uid = 234;
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->once();
+ $configAdapter->shouldReceive('set')->with($uid, 'test', 'it', 'now')->andReturn(true)->once();
+
+ $configuration = new PConfiguration($configCache, $configAdapter);
+
+ $this->assertTrue($configuration->set($uid, 'test', 'it', 'now'));
+
+ $this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+ }
+
+ /**
+ * Test the configuration get() method with wrong value and no db
+ */
+ public function testGetWrongWithoutDB()
+ {
+ $uid = 234;
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
+
+ $configuration = new PConfiguration($configCache, $configAdapter);
+
+ // without refresh
+ $this->assertNull($configuration->get($uid, 'test', 'it'));
+
+ // with default value
+ $this->assertEquals('default', $configuration->get($uid, 'test', 'it', 'default'));
+
+ // with default value and refresh
+ $this->assertEquals('default', $configuration->get($uid, 'test', 'it', 'default', true));
+ }
+
+ /**
+ * Test the configuration get() method with refresh
+ */
+ public function testGetWithRefresh()
+ {
+ $uid = 234;
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+ $configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('now')->once();
+ $configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('again')->once();
+ $configAdapter->shouldReceive('get')->with($uid, 'test', 'not')->andReturn('!<unset>!')->once();
+
+ $configuration = new PConfiguration($configCache, $configAdapter);
+
+ // without refresh
+ $this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+ // use the cache again
+ $this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+
+ // with refresh (and load the second value out of the db)
+ $this->assertEquals('again', $configuration->get($uid, 'test', 'it', null, true));
+
+ // without refresh and wrong value and default
+ $this->assertEquals('default', $configuration->get($uid, 'test', 'not', 'default'));
+ }
+
+ /**
+ * Test the configuration delete() method without adapter
+ */
+ public function testDeleteWithoutDB()
+ {
+ $uid = 234;
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
+
+ $configuration = new PConfiguration($configCache, $configAdapter);
+
+ $this->assertTrue($configuration->set($uid, 'test', 'it', 'now'));
+ $this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+
+ $this->assertTrue($configuration->delete($uid, 'test', 'it'));
+ $this->assertNull($configuration->get($uid, 'test', 'it'));
+ }
+
+ /**
+ * Test the configuration delete() method with adapter
+ */
+ public function testDeleteWithDB()
+ {
+ $uid = 234;
+ $configCache = new ConfigCache();
+ $configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+ $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(5);
+ $configAdapter->shouldReceive('set')->with($uid, 'test', 'it', 'now')->andReturn(false)->once();
+ $configAdapter->shouldReceive('delete')->with($uid, 'test', 'it')->andReturn(false)->once();
+
+ $configAdapter->shouldReceive('delete')->with($uid, 'test', 'second')->andReturn(true)->once();
+ $configAdapter->shouldReceive('delete')->with($uid, 'test', 'third')->andReturn(false)->once();
+ $configAdapter->shouldReceive('delete')->with($uid, 'test', 'quarter')->andReturn(true)->once();
+
+ $configuration = new PConfiguration($configCache, $configAdapter);
+
+ $this->assertFalse($configuration->set($uid, 'test', 'it', 'now'));
+ $this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+
+ // delete from set
+ $this->assertTrue($configuration->delete($uid, 'test', 'it'));
+ // delete from db only
+ $this->assertTrue($configuration->delete($uid, 'test', 'second'));
+ // no delete
+ $this->assertFalse($configuration->delete($uid, 'test', 'third'));
+ // delete both
+ $this->assertTrue($configuration->delete($uid, 'test', 'quarter'));
+ }
+}
$this->configCache
->shouldReceive('get')
- ->with('config', 'php_path', NULL)
+ ->with('config', 'php_path', NULL, false)
->andReturn(false);
$this->mockL10nT();
->once();
$this->configCache
->shouldReceive('get')
- ->with('config', 'test', NULL)
+ ->with('config', 'test', NULL, false)
->andReturn('now')
->twice();
$this->configCache
->shouldReceive('get')
- ->with('config', 'test', null)
+ ->with('config', 'test', null, false)
->andReturn('now')
->once();
$this->configCache
->shouldReceive('get')
- ->with('config', 'test', null)
+ ->with('config', 'test', null, false)
->andReturn(null)
->once();
$testArray = [1, 2, 3];
$this->configCache
->shouldReceive('get')
- ->with('config', 'test', null)
+ ->with('config', 'test', null, false)
->andReturn($testArray)
->once();
function testVerbose() {
$this->configCache
->shouldReceive('get')
- ->with('test', 'it', null)
+ ->with('test', 'it', null, false)
->andReturn('now')
->once();
$console = new Config($this->consoleArgv);
->once();
$this->configCache
->shouldReceive('get')
- ->with('test', 'it', NULL)
+ ->with('test', 'it', NULL, false)
->andReturn(NULL)
->once();
$console = new Config();
namespace Friendica\Test\src\Core\Console;
use Asika\SimpleConsole\Console;
-use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\Configuration;
use Friendica\Test\MockedTest;
use Friendica\Test\Util\AppMockTrait;
use Friendica\Test\Util\Intercept;
Intercept::setUp();
$this->setUpVfsDir();
- $configMock = \Mockery::mock(ConfigCache::class);
+ $configMock = \Mockery::mock(Configuration::class);
$this->mockApp($this->root, $configMock);
$profileMock = \Mockery::mock(Profiler::class);
$this->app->shouldReceive('getProfiler')->andReturn($profileMock);
{
// Reusable App object
$this->setUpVfsDir();
- $configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+ $configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
$this->mockApp($this->root, $configMock);
$this->app
->shouldReceive('getHostname')
{
$this->configCache
->shouldReceive('get')
- ->with('system', 'memcache_host', NULL)
+ ->with('system', 'memcache_host', NULL, false)
->andReturn('localhost');
$this->configCache
->shouldReceive('get')
- ->with('system', 'memcache_port', NULL)
+ ->with('system', 'memcache_port', NULL, false)
->andReturn(11211);
return new CacheLockDriver(CacheDriverFactory::create('memcache'));
{
$this->configCache
->shouldReceive('get')
- ->with('system', 'memcached_hosts', NULL)
+ ->with('system', 'memcached_hosts', NULL, false)
->andReturn([0 => 'localhost, 11211']);
return new CacheLockDriver(CacheDriverFactory::create('memcached'));
{
$this->configCache
->shouldReceive('get')
- ->with('system', 'redis_host', NULL)
+ ->with('system', 'redis_host', NULL, false)
->andReturn('localhost');
$this->configCache
->shouldReceive('get')
- ->with('system', 'redis_port', NULL)
+ ->with('system', 'redis_port', NULL, false)
->andReturn(null);
return new CacheLockDriver(CacheDriverFactory::create('redis'));
$this->configCache
->shouldReceive('get')
- ->with('system', 'temppath', NULL)
+ ->with('system', 'temppath', NULL, false)
->andReturn('/tmp/');
}
use Friendica\App;
use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
use Friendica\Database\DBA;
use Friendica\Factory;
use Friendica\Test\DatabaseTest;
public function setUp()
{
$basedir = BasePath::create(dirname(__DIR__) . '/../../');
- $configLoader = new Config\ConfigCacheLoader($basedir);
- $config = Factory\ConfigFactory::createCache($configLoader);
+ $configLoader = new Cache\ConfigCacheLoader($basedir);
+ $configCache = Factory\ConfigFactory::createCache($configLoader);
+ Factory\DBFactory::init($configCache, $_SERVER);
+ $config = Factory\ConfigFactory::createConfig($configCache);
+ $pconfig = Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('test', $config);
$profiler = Factory\ProfilerFactory::create($logger, $config);
$this->app = new App($config, $logger, $profiler, false);
namespace Friendica\Test\Database;
use Friendica\App;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
use Friendica\Database\DBStructure;
use Friendica\Factory;
use Friendica\Test\DatabaseTest;
public function setUp()
{
$basedir = BasePath::create(dirname(__DIR__) . '/../../');
- $configLoader = new Config\ConfigCacheLoader($basedir);
- $config = Factory\ConfigFactory::createCache($configLoader);
+ $configLoader = new Cache\ConfigCacheLoader($basedir);
+ $configCache = Factory\ConfigFactory::createCache($configLoader);
+ Factory\DBFactory::init($configCache, $_SERVER);
+ $config = Factory\ConfigFactory::createConfig($configCache);
+ $pconfig = Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('test', $config);
$profiler = Factory\ProfilerFactory::create($logger, $config);
$this->app = new App($config, $logger, $profiler, false);
projects / friendica.git / commitdiff