Fix CommandHelper::getConfigFiles() to also include the file passed into it

ondrejmirtes · ondrejmirtes · commit 5b764c7ee833 · 2020-03-02T13:47:28.000+01:00
diff --git a/src/Command/CommandHelper.php b/src/Command/CommandHelper.php
@@ -383,7 +383,7 @@ private static function detectDuplicateIncludedFiles(
 	{
 		$neonAdapter = new NeonAdapter();
 		$phpAdapter = new PhpAdapter();
-		$allConfigFiles = $configFiles;
+		$allConfigFiles = [];
 		foreach ($configFiles as $configFile) {
 			$allConfigFiles = array_merge($allConfigFiles, self::getConfigFiles($neonAdapter, $phpAdapter, $configFile, $loaderParameters));
 		}
@@ -433,13 +433,12 @@ private static function getConfigFiles(
 		} else {
 			$data = $neonAdapter->load($configFile);
 		}
-		$allConfigFiles = [];
+		$allConfigFiles = [$configFile];
 		if (isset($data['includes'])) {
 			Validators::assert($data['includes'], 'list', sprintf("section 'includes' in file '%s'", $configFile));
 			$includes = Helpers::expand($data['includes'], $loaderParameters);
 			foreach ($includes as $include) {
 				$include = self::expandIncludedFile($include, $configFile);
-				$allConfigFiles[] = $include;
 				$allConfigFiles = array_merge($allConfigFiles, self::getConfigFiles($neonAdapter, $phpAdapter, $include, $loaderParameters));
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ private static function detectDuplicateIncludedFiles(`
`383`	`383`	`{`
`384`	`384`	`$neonAdapter = new NeonAdapter();`
`385`	`385`	`$phpAdapter = new PhpAdapter();`
`386`		`- $allConfigFiles = $configFiles;`
	`386`	`+ $allConfigFiles = [];`
`387`	`387`	`foreach ($configFiles as $configFile) {`
`388`	`388`	`$allConfigFiles = array_merge($allConfigFiles, self::getConfigFiles($neonAdapter, $phpAdapter, $configFile, $loaderParameters));`
`389`	`389`	`}`
`@@ -433,13 +433,12 @@ private static function getConfigFiles(`
`433`	`433`	`} else {`
`434`	`434`	`$data = $neonAdapter->load($configFile);`
`435`	`435`	`}`
`436`		`- $allConfigFiles = [];`
	`436`	`+ $allConfigFiles = [$configFile];`
`437`	`437`	`if (isset($data['includes'])) {`
`438`	`438`	`Validators::assert($data['includes'], 'list', sprintf("section 'includes' in file '%s'", $configFile));`
`439`	`439`	`$includes = Helpers::expand($data['includes'], $loaderParameters);`
`440`	`440`	`foreach ($includes as $include) {`
`441`	`441`	`$include = self::expandIncludedFile($include, $configFile);`
`442`		`- $allConfigFiles[] = $include;`
`443`	`442`	`$allConfigFiles = array_merge($allConfigFiles, self::getConfigFiles($neonAdapter, $phpAdapter, $include, $loaderParameters));`
`444`	`443`	`}`
`445`	`444`	`}`