X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFactory%2FConfigFactory.php;h=954f893959229624e098ca2ac4ce09a6387d2110;hb=b0086a49e2c28c528e178bcdd28203207feceef6;hp=08fcddacead6d67e386c0ee80e418b61437fb1db;hpb=92c1cbeeeccf31ae311b532866610b48c97dccfe;p=friendica.git

diff --git a/src/Factory/ConfigFactory.php b/src/Factory/ConfigFactory.php
index 08fcddacea..954f893959 100644
--- a/src/Factory/ConfigFactory.php
+++ b/src/Factory/ConfigFactory.php
@@ -1,8 +1,27 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Factory;
 
-use Friendica\Core;
+use Exception;
 use Friendica\Core\Config;
 use Friendica\Core\Config\Cache;
 use Friendica\Model\Config\Config as ConfigModel;
@@ -14,55 +33,51 @@ class ConfigFactory
 	/**
 	 * @param ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig)
 	 *
-	 * @return Cache\ConfigCache
+	 * @return Cache
+	 *
+	 * @throws Exception
 	 */
 	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\Configuration
+	 * @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\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;
 	}
 
 	/**
-	 * @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\PConfiguration
+	 * @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);
 		}
 
-		// Set the config in the static container for legacy usage
-		Core\PConfig::init($configuration);
-
 		return $configuration;
 	}
 }