X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFactory%2FConfigFactory.php;h=ecec1e2a730e314cc498baa9705508885757d086;hb=b8f85f0484fbb1f37e9cae2f4cf98f9349fda099;hp=5a24f86283b4817d4b08e45457ee59220205a92f;hpb=6c68b8359dfc7d5c4d87a7d7dc4397778f911f80;p=friendica.git

diff --git a/src/Factory/ConfigFactory.php b/src/Factory/ConfigFactory.php
index 5a24f86283..ecec1e2a73 100644
--- a/src/Factory/ConfigFactory.php
+++ b/src/Factory/ConfigFactory.php
@@ -2,12 +2,11 @@
 
 namespace Friendica\Factory;
 
-use Friendica\Core;
 use Friendica\Core\Config;
-use Friendica\Core\Config\Adapter;
 use Friendica\Core\Config\Cache;
 use Friendica\Model\Config\Config as ConfigModel;
-use Friendica\Util\Config\ConfigFileLoader;
+use Friendica\Model\Config\PConfig as PConfigModel;
+use Friendica\Util\ConfigFileLoader;
 
 class ConfigFactory
 {
@@ -16,7 +15,7 @@ class ConfigFactory
 	 *
 	 * @return Cache\ConfigCache
 	 */
-	public static function createCache(ConfigFileLoader $loader)
+	public function createCache(ConfigFileLoader $loader)
 	{
 		$configCache = new Cache\ConfigCache();
 		$loader->setupCache($configCache);
@@ -26,11 +25,11 @@ class ConfigFactory
 
 	/**
 	 * @param Cache\ConfigCache $configCache The config cache of this adapter
-	 * @param ConfigModel $configModel The configuration model
+	 * @param ConfigModel       $configModel The configuration model
 	 *
-	 * @return Config\Configuration
+	 * @return Config\IConfiguration
 	 */
-	public static function createConfig(Cache\ConfigCache $configCache, ConfigModel $configModel)
+	public function createConfig(Cache\ConfigCache $configCache, ConfigModel $configModel)
 	{
 		if ($configCache->get('system', 'config_adapter') === 'preload') {
 			$configuration = new Config\PreloadConfiguration($configCache, $configModel);
@@ -39,32 +38,24 @@ class ConfigFactory
 		}
 
 
-		// 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  $configCache  The config cache
+	 * @param Cache\PConfigCache $pConfigCache The personal config cache
+	 * @param PConfigModel       $configModel  The configuration model
 	 *
-	 * @return Config\PConfiguration
+	 * @return Config\IPConfiguration
 	 */
-	public static function createPConfig(Cache\ConfigCache $configCache, Cache\PConfigCache $pConfigCache, $uid = null)
+	public function createPConfig(Cache\ConfigCache $configCache, Cache\PConfigCache $pConfigCache, PConfigModel $configModel)
 	{
 		if ($configCache->get('system', 'config_adapter') === 'preload') {
-			$configAdapter = new Adapter\PreloadPConfigAdapter($uid);
+			$configuration = new Config\PreloadPConfiguration($pConfigCache, $configModel);
 		} else {
-			$configAdapter = new Adapter\JITPConfigAdapter();
+			$configuration = new Config\JitPConfiguration($pConfigCache, $configModel);
 		}
 
-		$configuration = new Config\PConfiguration($pConfigCache, $configAdapter);
-
-		// Set the config in the static container for legacy usage
-		Core\PConfig::init($configuration);
-
 		return $configuration;
 	}
 }