From 5b764c7ee83332291ccb65ad66d9a62082c739e3 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Mon, 2 Mar 2020 13:47:28 +0100
Subject: [PATCH] Fix CommandHelper::getConfigFiles() to also include the file
 passed into it

---
 src/Command/CommandHelper.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Command/CommandHelper.php b/src/Command/CommandHelper.php
index a659ba9fd2..be535a49f4 100644
--- 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));
 			}
 		}