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 f912399345622560ac14dd72900ac9db723f7c9b..585d6eb7eed192f9acf9b84ae7ed919ca7b60e02 100644 (file)
--- a/src/Factory/ConfigFactory.php
+++ b/src/Factory/ConfigFactory.php
@@ -13,23 +13,23 @@ class ConfigFactory
        /**
         * @param ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig)
         *
-        * @return Cache\ConfigCache
+        * @return Cache
         */
        public function createCache(ConfigFileLoader $loader)
        {
-               $configCache = new Cache\ConfigCache();
+               $configCache = new Cache();
                $loader->setupCache($configCache);
 
                return $configCache;
        }
 
        /**
-        * @param Cache\ConfigCache $configCache The config cache of this adapter
-        * @param ConfigModel       $configModel The configuration model
+        * @param Cache       $configCache The config cache of this adapter
+        * @param ConfigModel $configModel The configuration model
         *
         * @return Config\IConfig
         */
-       public function createConfig(Cache\ConfigCache $configCache, ConfigModel $configModel)
+       public function createConfig(Cache $configCache, ConfigModel $configModel)
        {
                if ($configCache->get('system', 'config_adapter') === 'preload') {
                        $configuration = new Config\PreloadConfig($configCache, $configModel);
@@ -42,18 +42,18 @@ class ConfigFactory
        }
 
        /**
-        * @param Cache\ConfigCache  $configCache  The config cache
-        * @param Cache\PConfigCache $pConfigCache The personal config cache
-        * @param PConfigModel       $configModel  The configuration model
+        * @param Cache                         $configCache  The config cache
+        * @param \Friendica\Core\PConfig\Cache $pConfigCache The personal config cache
+        * @param PConfigModel                  $configModel  The configuration model
         *
-        * @return Config\IPConfiguration
+        * @return \Friendica\Core\PConfig\IPConfig
         */
-       public function createPConfig(Cache\ConfigCache $configCache, Cache\PConfigCache $pConfigCache, PConfigModel $configModel)
+       public function createPConfig(Cache $configCache, \Friendica\Core\PConfig\Cache $pConfigCache, PConfigModel $configModel)
        {
                if ($configCache->get('system', 'config_adapter') === 'preload') {
-                       $configuration = new Config\PreloadPConfiguration($pConfigCache, $configModel);
+                       $configuration = new \Friendica\Core\PConfig\PreloadPConfig($pConfigCache, $configModel);
                } else {
-                       $configuration = new Config\JitPConfiguration($pConfigCache, $configModel);
+                       $configuration = new \Friendica\Core\PConfig\JitPConfig($pConfigCache, $configModel);
                }
 
                return $configuration;