Shorten "Configuration" to "Config" again, since the Wrapper is gone

[friendica.git] / src / Factory / ConfigFactory.php

diff --git a/src/Factory/ConfigFactory.php b/src/Factory/ConfigFactory.php
index 08fcddacead6d67e386c0ee80e418b61437fb1db..f912399345622560ac14dd72900ac9db723f7c9b 100644 (file)
--- a/src/Factory/ConfigFactory.php
+++ b/src/Factory/ConfigFactory.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Factory;
 
-use Friendica\Core;
 use Friendica\Core\Config;
 use Friendica\Core\Config\Cache;
 use Friendica\Model\Config\Config as ConfigModel;
@@ -28,20 +27,17 @@ class ConfigFactory
         * @param Cache\ConfigCache $configCache The config cache of this adapter
         * @param ConfigModel       $configModel The configuration model
         *
-        * @return Config\Configuration
+        * @return Config\IConfig
         */
        public function createConfig(Cache\ConfigCache $configCache, ConfigModel $configModel)
        {
                if ($configCache->get('system', 'config_adapter') === 'preload') {
-                       $configuration = new Config\PreloadConfiguration($configCache, $configModel);
+                       $configuration = new Config\PreloadConfig($configCache, $configModel);
                } else {
-                       $configuration = new Config\JitConfiguration($configCache, $configModel);
+                       $configuration = new Config\JitConfig($configCache, $configModel);
                }
 
 
-               // Set the config in the static container for legacy usage
-               Core\Config::init($configuration);
-
                return $configuration;
        }
 
@@ -50,7 +46,7 @@ class ConfigFactory
         * @param Cache\PConfigCache $pConfigCache The personal config cache
         * @param PConfigModel       $configModel  The configuration model
         *
-        * @return Config\PConfiguration
+        * @return Config\IPConfiguration
         */
        public function createPConfig(Cache\ConfigCache $configCache, Cache\PConfigCache $pConfigCache, PConfigModel $configModel)
        {
@@ -60,9 +56,6 @@ class ConfigFactory
                        $configuration = new Config\JitPConfiguration($pConfigCache, $configModel);
                }
 
-               // Set the config in the static container for legacy usage
-               Core\PConfig::init($configuration);
-
                return $configuration;
        }
 }