Refactor IManageConfigValues interface

diff --git a/bin/daemon.php b/bin/daemon.php
index 385f725e34f3479dca3d6982146ce1beb514dedf..f9ed693f38fe277fd0601d176e3944a03d9c4f1c 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -71,7 +71,7 @@ if (DI::mode()->isInstall()) {
 
 DI::mode()->setExecutor(Mode::DAEMON);
 
-DI::config()->load();
+DI::config()->reload();
 
 if (empty(DI::config()->get('system', 'pidfile'))) {
        die(<<<TXT

diff --git a/src/App.php b/src/App.php
index c7c6c3590ce22b2629332bd75b45348b7dee9e7c..18a696734ee910655f3598d369a0fef0d9402642 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -296,8 +296,7 @@ class App
         */
        public function getBasePath(): string
        {
-               // Don't use the basepath of the config table for basepath (it should always be the config-file one)
-               return $this->config->getCache()->get('system', 'basepath');
+               return $this->config->get('system', 'basepath');
        }
 
        /**

diff --git a/src/Console/Config.php b/src/Console/Config.php
index b57cdbeec04c27de4237517893e298c480c004b5..8df7c28f21f19d61ba4a91a3aa1ea407023105f2 100644 (file)
--- a/src/Console/Config.php
+++ b/src/Console/Config.php
@@ -157,7 +157,7 @@ HELP;
 
                if (count($this->args) == 1) {
                        $cat = $this->getArgument(0);
-                       $this->config->load($cat);
+                       $this->config->reload();
                        $configCache = $this->config->getCache();
 
                        if ($configCache->get($cat) !== null) {
@@ -178,7 +178,7 @@ HELP;
                }
 
                if (count($this->args) == 0) {
-                       $this->config->load();
+                       $this->config->reload();
 
                        if ($this->config->get('system', 'config_adapter') == 'jit' && $this->appMode->has(App\Mode::DBCONFIGAVAILABLE)) {
                                $this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');

diff --git a/src/Core/Config/Capability/IManageConfigValues.php b/src/Core/Config/Capability/IManageConfigValues.php
index 27238822aefa9af833d945b3a1e7c336bb9e42f9..88fa96314ba7056038808ecd48c310d17957ef26 100644 (file)
--- a/src/Core/Config/Capability/IManageConfigValues.php
+++ b/src/Core/Config/Capability/IManageConfigValues.php
@@ -30,36 +30,32 @@ use Friendica\Core\Config\ValueObject\Cache;
 interface IManageConfigValues
 {
        /**
-        * Loads all configuration values of family into a cached storage.
+        * Reloads all configuration values (from filesystem and environment variables)
         *
         * All configuration values of the system are stored in the cache.
         *
-        * @param string $cat The category of the configuration value
-        *
         * @return void
         *
         * @throws ConfigPersistenceException In case the persistence layer throws errors
         */
-       public function load(string $cat = 'config');
+       public function reload();
 
        /**
         * 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 database or from the cache.
         *
         * @param string  $cat        The category of the configuration value
         * @param string  $key           The configuration key to query
         * @param mixed   $default_value Deprecated, use `Config->get($cat, $key, null, $refresh) ?? $default_value` instead
-        * @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
         *
         * @throws ConfigPersistenceException In case the persistence layer throws errors
         *
         */
-       public function get(string $cat, string $key, $default_value = null, bool $refresh = false);
+       public function get(string $cat, string $key, $default_value = null);
 
        /**
         * Sets a configuration value for system config
@@ -81,6 +77,8 @@ interface IManageConfigValues
 
        /**
         * Save back the overridden values of the config cache
+        *
+        * @throws ConfigPersistenceException In case the persistence layer throws errors
         */
        public function save();
 

diff --git a/src/Core/Config/Factory/Config.php b/src/Core/Config/Factory/Config.php
index fac931fac5d69741f2db3b6f48c67e674de5357f..e1094fd70dd76ff491ba2b8459b747092e3a252a 100644 (file)
--- a/src/Core/Config/Factory/Config.php
+++ b/src/Core/Config/Factory/Config.php
@@ -81,21 +81,4 @@ class Config
 
                return $configCache;
        }
-
-       /**
-        * @param Cache $configCache The config cache of this adapter
-        * @param Repository\Config $configRepo  The configuration repository
-        *
-        * @return Capability\IManageConfigValues
-        */
-       public function create(Util\ConfigFileManager $loader, Cache $configCache, Repository\Config $configRepo)
-       {
-               if ($configCache->get('system', 'config_adapter') === 'preload') {
-                       $configuration = new Type\PreloadConfig($loader, $configCache, $configRepo);
-               } else {
-                       $configuration = new Type\JitConfig($loader, $configCache, $configRepo);
-               }
-
-               return $configuration;
-       }
 }

diff --git a/src/Core/Config/Model/Config.php b/src/Core/Config/Model/Config.php
index 3af2f7e4b1e8c3f992ce09d6ddf05e28bb25b441..3de97158f2c449ba581826a261fd072d453a5e20 100644 (file)
--- a/src/Core/Config/Model/Config.php
+++ b/src/Core/Config/Model/Config.php
@@ -22,6 +22,8 @@
 namespace Friendica\Core\Config\Model;
 
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Config\Exception\ConfigFileException;
+use Friendica\Core\Config\Exception\ConfigPersistenceException;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Config\ValueObject\Cache;
 
@@ -38,14 +40,19 @@ class Config implements IManageConfigValues
        /** @var ConfigFileManager */
        protected $configFileManager;
 
+       /** @var array */
+       protected $server;
+
        /**
         * @param ConfigFileManager $configFileManager The configuration file manager to save back configs
-        * @param Cache  $configCache The configuration cache (based on the config-files)
+        * @param Cache             $configCache       The configuration cache (based on the config-files)
+        * @param array             $server            The $_SERVER variable
         */
-       public function __construct(ConfigFileManager $configFileManager, Cache $configCache)
+       public function __construct(ConfigFileManager $configFileManager, Cache $configCache, array $server = [])
        {
                $this->configFileManager = $configFileManager;
                $this->configCache       = $configCache;
+               $this->server            = $server;
        }
 
        /**
@@ -56,24 +63,36 @@ class Config implements IManageConfigValues
                return $this->configCache;
        }
 
+       /** {@inheritDoc} */
        public function save()
        {
-               $this->configFileManager->saveData($this->configCache);
+               try {
+                       $this->configFileManager->saveData($this->configCache);
+               } catch (ConfigFileException $e) {
+                       throw new ConfigPersistenceException('Cannot save config', $e);
+               }
        }
 
-       public function load(string $cat = 'config')
+       /** {@inheritDoc} */
+       public function reload()
        {
                $configCache = new Cache();
 
-               $this->configFileManager->setupCache($configCache, $_SERVER);
+               try {
+                       $this->configFileManager->setupCache($configCache, $this->server);
+               } catch (ConfigFileException $e) {
+                       throw new ConfigPersistenceException('Cannot reload config', $e);
+               }
                $this->configCache = $configCache;
        }
 
-       public function get(string $cat, string $key, $default_value = null, bool $refresh = false)
+       /** {@inheritDoc} */
+       public function get(string $cat, string $key, $default_value = null)
        {
                return $this->configCache->get($cat, $key) ?? $default_value;
        }
 
+       /** {@inheritDoc} */
        public function set(string $cat, string $key, $value, bool $autosave = true): bool
        {
                $stored = $this->configCache->set($cat, $key, $value, Cache::SOURCE_DATA);
@@ -85,6 +104,7 @@ class Config implements IManageConfigValues
                return $stored;
        }
 
+       /** {@inheritDoc} */
        public function delete(string $cat, string $key, bool $autosave = true): bool
        {
                $removed = $this->configCache->delete($cat, $key);

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 8da473839d553ec8e844324a15fb4e9dbab2ce8e..9a2ebe1bba8db060cd4f6ac3310e7344ef1d124f 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -54,7 +54,7 @@ class Update
                }
 
                // Don't check the status if the last update was failed
-               if (DI::config()->get('system', 'update', Update::SUCCESS, true) == Update::FAILED) {
+               if (DI::config()->get('system', 'update', Update::SUCCESS) == Update::FAILED) {
                        return;
                }
 
@@ -119,7 +119,7 @@ class Update
                        DI::lock()->release('dbupdate', true);
                }
 
-               $build = DI::config()->get('system', 'build', null, true);
+               $build = DI::config()->get('system', 'build', null);
 
                if (empty($build) || ($build > DB_UPDATE_VERSION)) {
                        $build = DB_UPDATE_VERSION - 1;
@@ -132,7 +132,7 @@ class Update
                        $stored = intval($build);
                        $current = intval(DB_UPDATE_VERSION);
                        if ($stored < $current || $force) {
-                               DI::config()->load('database');
+                               DI::config()->reload();
 
                                // Compare the current structure with the defined structure
                                // If the Lock is acquired, never release it automatically to avoid double updates
@@ -141,7 +141,7 @@ class Update
                                        Logger::notice('Update starting.', ['from' => $stored, 'to' => $current]);
 
                                        // Checks if the build changed during Lock acquiring (so no double update occurs)
-                                       $retryBuild = DI::config()->get('system', 'build', null, true);
+                                       $retryBuild = DI::config()->get('system', 'build', null);
                                        if ($retryBuild !== $build) {
                                                Logger::notice('Update already done.', ['from' => $stored, 'to' => $current]);
                                                DI::lock()->release('dbupdate');

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 8fc74f1d8336204e8e01f3fbc1ffbc71734b47f1..2db9256d13804c372a5e0e98b44c77f67f1eb215 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -331,7 +331,7 @@ class Worker
                $mypid = getmypid();
 
                // Quit when in maintenance
-               if (DI::config()->get('system', 'maintenance', false, true)) {
+               if (DI::config()->get('system', 'maintenance', false)) {
                        Logger::notice('Maintenance mode - quit process', ['pid' => $mypid]);
                        return false;
                }

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 72360ddcaf45df6e02c70a26f30c26028d3cdc56..bbcccd7dad843a3db3fc798e037cfac17f5b97c2 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -157,7 +157,7 @@ class Friendica extends BaseModule
 
                $visible_addons = Addon::getVisibleList();
 
-               $config->load('feature_lock');
+               $config->reload();
                $locked_features = [];
                $featureLocks = $config->get('config', 'feature_lock');
                if (isset($featureLocks)) {

diff --git a/src/Worker/DBUpdate.php b/src/Worker/DBUpdate.php
index e11f7bf40decc3d658578dce7022ce871410d4ed..7b7c3b8c92d97c9ac9a6a636bdf98fa05e36150f 100644 (file)
--- a/src/Worker/DBUpdate.php
+++ b/src/Worker/DBUpdate.php
@@ -32,7 +32,7 @@ class DBUpdate
        public static function execute()
        {
                // Just in case the last update wasn't failed
-               if (DI::config()->get('system', 'update', Update::SUCCESS, true) != Update::FAILED) {
+               if (DI::config()->get('system', 'update', Update::SUCCESS) != Update::FAILED) {
                        Update::run(DI::app()->getBasePath());
                }
        }

diff --git a/static/dependencies.config.php b/static/dependencies.config.php
index 90f01feede02ecfdc68cc29b85a3c47a69299863..1844001bb4945123c7defbef9face6c707288940 100644 (file)
--- a/static/dependencies.config.php
+++ b/static/dependencies.config.php
@@ -99,6 +99,9 @@ return [
        ],
        Config\Capability\IManageConfigValues::class => [
                'instanceOf' => Config\Model\Config::class,
+               'constructParams' => [
+                       $_SERVER,
+               ],
        ],
        PConfig\Capability\IManagePersonalConfigValues::class => [
                'instanceOf' => PConfig\Factory\PConfig::class,

diff --git a/update.php b/update.php
index fda04b6ce4b01881af95741464a0959a2ded10a5..b9edbabd75179a84739f05b5b2fe8535398a9625 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1178,12 +1178,6 @@ function update_1505()
 
 function update_1508()
 {
-       $categories = DBA::toArray(DBA::p("SELECT DISTINCT `cat` AS 'cat' FROM `config`"));
-
-       foreach ($categories as $category) {
-               DI::config()->load($category['cat']);
-       }
-
        $config = DBA::selectToArray('config');
 
        foreach ($config as $entry) {

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 6e05c6b328e5b590aa4283856473ed27d99fd93a..8feefdc930f4401140199947057f6f58b350adb2 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -49,7 +49,7 @@ $login_bg_color   = '';
 $modified         = time();
 
 if (DI::mode()->has(\Friendica\App\Mode::MAINTENANCEDISABLED)) {
-       DI::config()->load('frio');
+       DI::config()->reload('frio');
 
        // Default to hard-coded values for empty settings
        $scheme           = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));