Some improvements

- Move $_SERVER into ConfigFileManager constructor
- Rename "creatConfigFileLoader" to "createConfigFileManager"
- Rename variable "loader" to "manager" in all tests

src/App.php

@@ -359,7 +359,7 @@ class App
 			$this->profiler->update($this->config);
 
 			Core\Hook::loadHooks();
-			$loader = (new Config())->createConfigFileLoader($this->getBasePath(), $_SERVER);
+			$loader = (new Config())->createConfigFileManager($this->getBasePath(), $_SERVER);
 			Core\Hook::callAll('load_config', $loader);
 
 			// Hooks are now working, reload the whole definitions with hook enabled

src/Core/Config/Factory/Config.php

@@ -56,7 +56,7 @@ class Config
 	 *
 	 * @return Util\ConfigFileManager
 	 */
-	public function createConfigFileLoader(string $basePath, array $server = []): Util\ConfigFileManager
+	public function createConfigFileManager(string $basePath, array $server = []): Util\ConfigFileManager
 	{
 		if (!empty($server[self::CONFIG_DIR_ENV]) && is_dir($server[self::CONFIG_DIR_ENV])) {
 			$configDir = $server[self::CONFIG_DIR_ENV];
@@ -65,19 +65,18 @@ class Config
 		}
 		$staticDir = $basePath . DIRECTORY_SEPARATOR . self::STATIC_DIR;
 
-		return new Util\ConfigFileManager($basePath, $configDir, $staticDir, new Util\ConfigFileTransformer());
+		return new Util\ConfigFileManager($basePath, $configDir, $staticDir, $server);
 	}
 
 	/**
 	 * @param Util\ConfigFileManager $configFileManager The Config Cache manager (INI/config/.htconfig)
-	 * @param array                  $server
 	 *
 	 * @return Cache
 	 */
-	public function createCache(Util\ConfigFileManager $configFileManager, array $server = []): Cache
+	public function createCache(Util\ConfigFileManager $configFileManager): Cache
 	{
 		$configCache = new Cache();
-		$configFileManager->setupCache($configCache, $server);
+		$configFileManager->setupCache($configCache);
 
 		return $configCache;
 	}

src/Core/Config/Model/Config.php

@@ -39,19 +39,14 @@ class Config implements IManageConfigValues
 	/** @var ConfigFileManager */
 	protected $configFileManager;
 
-	/** @var array */
-	protected $server;
-
 	/**
 	 * @param ConfigFileManager $configFileManager The configuration file manager to save back configs
 	 * @param Cache             $configCache       The configuration cache (based on the config-files)
-	 * @param array             $server            The $_SERVER variable
 	 */
-	public function __construct(ConfigFileManager $configFileManager, Cache $configCache, array $server = [])
+	public function __construct(ConfigFileManager $configFileManager, Cache $configCache)
 	{
 		$this->configFileManager = $configFileManager;
 		$this->configCache       = $configCache;
-		$this->server            = $server;
 	}
 
 	/**
@@ -87,7 +82,7 @@ class Config implements IManageConfigValues
 		$configCache = new Cache();
 
 		try {
-			$this->configFileManager->setupCache($configCache, $this->server);
+			$this->configFileManager->setupCache($configCache);
 		} catch (ConfigFileException $e) {
 			throw new ConfigPersistenceException('Cannot reload config', $e);
 		}

src/Core/Config/Util/ConfigFileManager.php

@@ -69,16 +69,22 @@ class ConfigFileManager
 	 */
 	private $staticDir;
 
+	/**
+	 * @var array
+	 */
+	private $server;
+
 	/**
 	 * @param string $baseDir   The base
 	 * @param string $configDir
 	 * @param string $staticDir
 	 */
-	public function __construct(string $baseDir, string $configDir, string $staticDir)
+	public function __construct(string $baseDir, string $configDir, string $staticDir, array $server = [])
 	{
 		$this->baseDir   = $baseDir;
 		$this->configDir = $configDir;
 		$this->staticDir = $staticDir;
+		$this->server    = $server;
 	}
 
 	/**
@@ -88,12 +94,11 @@ class ConfigFileManager
 	 * expected local.config.php
 	 *
 	 * @param Cache $config The config cache to load to
-	 * @param array $server The $_SERVER array
 	 * @param bool  $raw    Set up the raw config format
 	 *
 	 * @throws ConfigFileException
 	 */
-	public function setupCache(Cache $config, array $server = [], bool $raw = false)
+	public function setupCache(Cache $config, bool $raw = false)
 	{
 		// Load static config files first, the order is important
 		$config->load($this->loadStaticConfig('defaults'), Cache::SOURCE_STATIC);
@@ -109,7 +114,7 @@ class ConfigFileManager
 		// Now load the node.config.php file with the node specific config values (based on admin gui/console actions)
 		$this->loadDataConfig($config);
 
-		$config->load($this->loadEnvConfig($server), Cache::SOURCE_ENV);
+		$config->load($this->loadEnvConfig(), Cache::SOURCE_ENV);
 
 		// In case of install mode, add the found basepath (because there isn't a basepath set yet
 		if (!$raw && empty($config->get('system', 'basepath'))) {
@@ -250,13 +255,11 @@ class ConfigFileManager
 	/**
 	 * Tries to load environment specific variables, based on the `env.config.php` mapping table
 	 *
-	 * @param array $server The $_SERVER variable
-	 *
 	 * @return array The config array (empty if no config was found)
 	 *
 	 * @throws ConfigFileException if the configuration file isn't readable
 	 */
-	public function loadEnvConfig(array $server): array
+	protected function loadEnvConfig(): array
 	{
 		$filepath = $this->staticDir . DIRECTORY_SEPARATOR .   // /var/www/html/static/
 					"env.config.php";                          // env.config.php
@@ -270,8 +273,8 @@ class ConfigFileManager
 		$return = [];
 
 		foreach ($envConfig as $envKey => $configStructure) {
-			if (isset($server[$envKey])) {
+			if (isset($this->server[$envKey])) {
-				$return[$configStructure[0]][$configStructure[1]] = $server[$envKey];
+				$return[$configStructure[0]][$configStructure[1]] = $this->server[$envKey];
 			}
 		}
 
@@ -296,7 +299,9 @@ class ConfigFileManager
 		$sampleEnd = self::SAMPLE_END . ($ini ? '.ini.php' : '.config.php');
 
 		foreach ($files as $filename) {
-			if (fnmatch($filePattern, $filename) && substr_compare($filename, $sampleEnd, -strlen($sampleEnd))) {
+			if (fnmatch($filePattern, $filename) &&
+				substr_compare($filename, $sampleEnd, -strlen($sampleEnd)) &&
+				$filename !== self::CONFIG_DATA_FILE) {
 				$found[] = $this->configDir . '/' . $filename;
 			}
 		}

src/Module/Admin/Summary.php

@@ -154,7 +154,7 @@ class Summary extends BaseAdmin
 		}
 
 		// check legacy basepath settings
-		$configLoader = (new Config())->createConfigFileLoader($a->getBasePath(), $_SERVER);
+		$configLoader = (new Config())->createConfigFileManager($a->getBasePath(), $_SERVER);
 		$configCache = new Cache();
 		$configLoader->setupCache($configCache);
 		$confBasepath = $configCache->get('system', 'basepath');

static/dependencies.config.php

@@ -79,7 +79,7 @@ return [
 	Config\Util\ConfigFileManager::class => [
 		'instanceOf' => Config\Factory\Config::class,
 		'call'       => [
-			['createConfigFileLoader', [
+			['createConfigFileManager', [
 				[Dice::INSTANCE => '$basepath'],
 				$_SERVER,
 			], Dice::CHAIN_CALL],
@@ -88,7 +88,7 @@ return [
 	Config\ValueObject\Cache::class => [
 		'instanceOf' => Config\Factory\Config::class,
 		'call'       => [
-			['createCache', [$_SERVER], Dice::CHAIN_CALL],
+			['createCache', [], Dice::CHAIN_CALL],
 		],
 	],
 	App\Mode::class              => [

tests/FixtureTest.php

@@ -62,7 +62,7 @@ abstract class FixtureTest extends DatabaseTest
 			->addRules(include __DIR__ . '/../static/dependencies.config.php')
 			->addRule(ConfigFileManager::class, [
 				'instanceOf' => Config::class,
-				'call'       => [['createConfigFileLoader', [$this->root->url(), $server,],
+				'call'       => [['createConfigFileManager', [$this->root->url(), $server,],
 								  Dice::CHAIN_CALL]]])
 			->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true])
 			->addRule(IHandleSessions::class, ['instanceOf' => Memory::class, 'shared' => true, 'call' => null])

tests/src/Core/Cache/DatabaseCacheTest.php

@@ -55,8 +55,8 @@ class DatabaseCacheTest extends CacheTest
 
 		// load real config to avoid mocking every config-entry which is related to the Database class
 		$configFactory     = new Config();
-		$loader = (new Config())->createConfigFileLoader($this->root->url(), []);
+		$configFileManager = (new Config())->createConfigFileManager($this->root->url(), []);
-		$configCache = $configFactory->createCache($loader);
+		$configCache       = $configFactory->createCache($configFileManager);
 
 		$dbaDefinition  = (new DbaDefinition($configCache->get('system', 'basepath')))->load();
 		$viewDefinition = (new ViewDefinition($configCache->get('system', 'basepath')))->load();

tests/src/Core/Config/Cache/ConfigFileManagerTest.php

@@ -51,6 +51,7 @@ class ConfigFileManagerTest extends MockedTest
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
 		);
+
 		$configCache = new Cache();
 
 		$configFileLoader->setupCache($configCache);
@@ -338,6 +339,7 @@ class ConfigFileManagerTest extends MockedTest
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
 		);
+
 		$configCache = new Cache();
 
 		$configFileLoader->setupCache($configCache);
@@ -353,10 +355,10 @@ class ConfigFileManagerTest extends MockedTest
 	{
 		$this->delConfigFile('local.config.php');
 
-		$configFileLoader = (new Config())->createConfigFileLoader($this->root->url(), ['FRIENDICA_CONFIG_DIR' => '/a/wrong/dir/']);
+		$configFileManager = (new Config())->createConfigFileManager($this->root->url(), ['FRIENDICA_CONFIG_DIR' => '/a/wrong/dir/']);
 		$configCache       = new Cache();
 
-		$configFileLoader->setupCache($configCache);
+		$configFileManager->setupCache($configCache);
 
 		self::assertEquals($this->root->url(), $configCache->get('system', 'basepath'));
 	}
@@ -379,10 +381,13 @@ class ConfigFileManagerTest extends MockedTest
 				 ->at($this->root->getChild('config2'))
 				 ->setContent(file_get_contents($fileDir . 'B.config.php'));
 
-		$configFileLoader = (new Config())->createConfigFileLoader($this->root->url(), ['FRIENDICA_CONFIG_DIR' => $this->root->getChild('config2')->url()]);
+		$configFileManager = (new Config())->createConfigFileManager($this->root->url(),
+			[
+				'FRIENDICA_CONFIG_DIR' => $this->root->getChild('config2')->url(),
+			]);
 		$configCache       = new Cache();
 
-		$configFileLoader->setupCache($configCache);
+		$configFileManager->setupCache($configCache);
 
 		self::assertEquals('newValue', $configCache->get('system', 'newKey'));
 	}
@@ -402,10 +407,13 @@ class ConfigFileManagerTest extends MockedTest
 				 ->at($this->root->getChild('config2'))
 				 ->setContent(file_get_contents($fileDir . 'B.config.php'));
 
-		$configFileLoader = (new Config())->createConfigFileLoader($this->root->url(), ['FRIENDICA_CONFIG_DIR' => $this->root->getChild('config2')->url()]);
+		$configFileManager = (new Config())->createConfigFileManager($this->root->url(),
+			[
+				'FRIENDICA_CONFIG_DIR' => $this->root->getChild('config2')->url(),
+			]);
 		$configCache       = new Cache();
 
-		$configFileLoader->setupCache($configCache);
+		$configFileManager->setupCache($configCache);
 
 		$specialChars = '!"§$%&/()(/&%$\'><?$a,;:[]}{}\\?¿¿ß';
 
@@ -414,11 +422,11 @@ class ConfigFileManagerTest extends MockedTest
 		$configCache->set('config', 'test', 'it', Cache::SOURCE_DATA);
 		$configCache->set('system', 'test_2', 2, Cache::SOURCE_DATA);
 		$configCache->set('special_chars', 'special', $specialChars, Cache::SOURCE_DATA);
-		$configFileLoader->saveData($configCache);
+		$configFileManager->saveData($configCache);
 
 		// Reload the configCache with the new values
 		$configCache2 = new Cache();
-		$configFileLoader->setupCache($configCache2);
+		$configFileManager->setupCache($configCache2);
 
 		self::assertEquals($configCache, $configCache2);
 		self::assertEquals([

tests/src/Core/Config/ConfigTest.php

@@ -76,7 +76,7 @@ class ConfigTest extends MockedTest
 	 */
 	public function getInstance()
 	{
-		$this->configFileManager->setupCache($this->configCache, []);
+		$this->configFileManager->setupCache($this->configCache);
 		return new Config($this->configFileManager, $this->configCache);
 	}
 

tests/src/Core/Storage/DatabaseStorageTest.php

@@ -54,8 +54,8 @@ class DatabaseStorageTest extends StorageTest
 
 		// load real config to avoid mocking every config-entry which is related to the Database class
 		$configFactory     = new Config();
-		$loader        = (new Config())->createConfigFileLoader($this->root->url(), []);
+		$configFileManager = (new Config())->createConfigFileManager($this->root->url());
-		$configCache   = $configFactory->createCache($loader);
+		$configCache       = $configFactory->createCache($configFileManager);
 
 		$dbaDefinition  = (new DbaDefinition($configCache->get('system', 'basepath')))->load();
 		$viewDefinition = (new ViewDefinition($configCache->get('system', 'basepath')))->load();

tests/src/Core/Storage/Repository/StorageManagerTest.php

@@ -52,6 +52,7 @@ use Friendica\Test\Util\SampleStorageBackend;
 class StorageManagerTest extends DatabaseTest
 {
 	use VFSTrait;
+
 	/** @var Database */
 	private $dba;
 	/** @var IManageConfigValues */
@@ -78,17 +79,18 @@ class StorageManagerTest extends DatabaseTest
 
 		// load real config to avoid mocking every config-entry which is related to the Database class
 		$configFactory     = new Config();
-		$loader        = $configFactory->createConfigFileLoader($this->root->url(), []);
+		$configFileManager = $configFactory->createConfigFileManager($this->root->url());
-		$configCache   = $configFactory->createCache($loader);
+		$configCache       = $configFactory->createCache($configFileManager);
 
 		$dbaDefinition  = (new DbaDefinition($configCache->get('system', 'basepath')))->load();
 		$viewDefinition = (new ViewDefinition($configCache->get('system', 'basepath')))->load();
 
 		$this->dba = new StaticDatabase($configCache, $profiler, $dbaDefinition, $viewDefinition);
 
-		$this->config = new \Friendica\Core\Config\Model\Config($loader, $configCache);
+		$this->config = new \Friendica\Core\Config\Model\Config($configFileManager, $configCache);
 		$this->config->set('storage', 'name', 'Database');
-		$this->config->set('storage', 'filesystem_path', $this->root->getChild(Type\FilesystemConfig::DEFAULT_BASE_FOLDER)->url());
+		$this->config->set('storage', 'filesystem_path', $this->root->getChild(Type\FilesystemConfig::DEFAULT_BASE_FOLDER)
+																	->url());
 
 		$this->l10n = \Mockery::mock(L10n::class);
 	}