Fix excluding files when excludePaths.analyse and excludePaths.analyseAndScan are used at the same time

ondrejmirtes · web-flow · commit 09e4fbec99e0 · 2021-01-24T10:37:41.000+01:00
diff --git a/src/File/FileExcluderFactory.php b/src/File/FileExcluderFactory.php
@@ -44,7 +44,7 @@ public function createAnalyseFileExcluder(): FileExcluder
 			$paths = $this->excludePaths['analyse'];
 		}
 		if (array_key_exists('analyseAndScan', $this->excludePaths)) {
-			$paths = $this->excludePaths['analyseAndScan'];
+			$paths = array_merge($paths, $this->excludePaths['analyseAndScan']);
 		}
 
 		return $this->fileExcluderRawFactory->create(array_values(array_unique($paths)));

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function createAnalyseFileExcluder(): FileExcluder`
`44`	`44`	`$paths = $this->excludePaths['analyse'];`
`45`	`45`	`}`
`46`	`46`	`if (array_key_exists('analyseAndScan', $this->excludePaths)) {`
`47`		`- $paths = $this->excludePaths['analyseAndScan'];`
	`47`	`+ $paths = array_merge($paths, $this->excludePaths['analyseAndScan']);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`return $this->fileExcluderRawFactory->create(array_values(array_unique($paths)));`