Skip to content

Commit 5b764c7

Browse files
committed
Fix CommandHelper::getConfigFiles() to also include the file passed into it
1 parent fcc00dc commit 5b764c7

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/Command/CommandHelper.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ private static function detectDuplicateIncludedFiles(
383383
{
384384
$neonAdapter = new NeonAdapter();
385385
$phpAdapter = new PhpAdapter();
386-
$allConfigFiles = $configFiles;
386+
$allConfigFiles = [];
387387
foreach ($configFiles as $configFile) {
388388
$allConfigFiles = array_merge($allConfigFiles, self::getConfigFiles($neonAdapter, $phpAdapter, $configFile, $loaderParameters));
389389
}
@@ -433,13 +433,12 @@ private static function getConfigFiles(
433433
} else {
434434
$data = $neonAdapter->load($configFile);
435435
}
436-
$allConfigFiles = [];
436+
$allConfigFiles = [$configFile];
437437
if (isset($data['includes'])) {
438438
Validators::assert($data['includes'], 'list', sprintf("section 'includes' in file '%s'", $configFile));
439439
$includes = Helpers::expand($data['includes'], $loaderParameters);
440440
foreach ($includes as $include) {
441441
$include = self::expandIncludedFile($include, $configFile);
442-
$allConfigFiles[] = $include;
443442
$allConfigFiles = array_merge($allConfigFiles, self::getConfigFiles($neonAdapter, $phpAdapter, $include, $loaderParameters));
444443
}
445444
}

0 commit comments

Comments
 (0)