Shorten "PConfiguration" to "PConfig" 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 7764d89900417c3d2499b3d171b15222b30197ac..585d6eb7eed192f9acf9b84ae7ed919ca7b60e02 100644 (file)
--- a/src/Factory/ConfigFactory.php
+++ b/src/Factory/ConfigFactory.php
@@ -2,68 +2,60 @@
 
 namespace Friendica\Factory;
 
-use Friendica\Core;
 use Friendica\Core\Config;
-use Friendica\Core\Config\Adapter;
 use Friendica\Core\Config\Cache;
-use Friendica\Util\Config\ConfigFileLoader;
+use Friendica\Model\Config\Config as ConfigModel;
+use Friendica\Model\Config\PConfig as PConfigModel;
+use Friendica\Util\ConfigFileLoader;
 
 class ConfigFactory
 {
        /**
         * @param ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig)
         *
-        * @return Cache\ConfigCache
+        * @return Cache
         */
-       public static function createCache(ConfigFileLoader $loader)
+       public function createCache(ConfigFileLoader $loader)
        {
-               $configCache = new Cache\ConfigCache();
+               $configCache = new Cache();
                $loader->setupCache($configCache);
 
                return $configCache;
        }
 
        /**
-        * @param Cache\ConfigCache $configCache The config cache
+        * @param Cache       $configCache The config cache of this adapter
+        * @param ConfigModel $configModel The configuration model
         *
-        * @return Config\Configuration
+        * @return Config\IConfig
         */
-       public static function createConfig(Cache\ConfigCache $configCache)
+       public function createConfig(Cache $configCache, ConfigModel $configModel)
        {
                if ($configCache->get('system', 'config_adapter') === 'preload') {
-                       $configAdapter = new Adapter\PreloadConfigAdapter();
+                       $configuration = new Config\PreloadConfig($configCache, $configModel);
                } else {
-                       $configAdapter = new Adapter\JITConfigAdapter();
+                       $configuration = new Config\JitConfig($configCache, $configModel);
                }
 
-               $configuration = new Config\Configuration($configCache, $configAdapter);
-
-               // Set the config in the static container for legacy usage
-               Core\Config::init($configuration);
 
                return $configuration;
        }
 
        /**
-        * @param Cache\ConfigCache $configCache The config cache
-        * @param Cache\PConfigCache  $pConfigCache The personal config cache
-        * @param int                $uid         The UID of the current user
+        * @param Cache                         $configCache  The config cache
+        * @param \Friendica\Core\PConfig\Cache $pConfigCache The personal config cache
+        * @param PConfigModel                  $configModel  The configuration model
         *
-        * @return Config\PConfiguration
+        * @return \Friendica\Core\PConfig\IPConfig
         */
-       public static function createPConfig(Cache\ConfigCache $configCache, Cache\PConfigCache $pConfigCache, $uid = null)
+       public function createPConfig(Cache $configCache, \Friendica\Core\PConfig\Cache $pConfigCache, PConfigModel $configModel)
        {
                if ($configCache->get('system', 'config_adapter') === 'preload') {
-                       $configAdapter = new Adapter\PreloadPConfigAdapter($uid);
+                       $configuration = new \Friendica\Core\PConfig\PreloadPConfig($pConfigCache, $configModel);
                } else {
-                       $configAdapter = new Adapter\JITPConfigAdapter();
+                       $configuration = new \Friendica\Core\PConfig\JitPConfig($pConfigCache, $configModel);
                }
 
-               $configuration = new Config\PConfiguration($pConfigCache, $configAdapter);
-
-               // Set the config in the static container for legacy usage
-               Core\PConfig::init($configuration);
-
                return $configuration;
        }
 }