[Finder] Fix finding VCS re-included files in excluded directory

julienfalque · julienfalque · commit f3cb377762f8 · 2022-01-20T18:44:49.000+01:00
diff --git a/src/Symfony/Component/Finder/Iterator/VcsIgnoredFilterIterator.php b/src/Symfony/Component/Finder/Iterator/VcsIgnoredFilterIterator.php
@@ -60,8 +60,6 @@ private function isIgnored(string $fileRealPath): bool
 
         foreach ($this->parentsDirectoryDownward($fileRealPath) as $parentDirectory) {
             if ($this->isIgnored($parentDirectory)) {
-                $ignored = true;
-
                 // rules in ignored directories are ignored, no need to check further.
                 break;
             }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/VcsIgnoredFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/VcsIgnoredFilterIteratorTest.php
@@ -247,6 +247,20 @@ public function getAcceptData(): iterable
                 'a/b/c/d.txt',
             ],
         ];
+
+        yield 'file included from subdirectory with everything excluded' => [
+            [
+                '.gitignore' => "/a/**\n!/a/b.txt",
+            ],
+            [
+                'a/a.txt',
+                'a/b.txt',
+                'a/c.txt',
+            ],
+            [
+                'a/b.txt',
+            ],
+        ];
     }
 
     public function testAcceptAtRootDirectory()

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ private function isIgnored(string $fileRealPath): bool`
`60`	`60`
`61`	`61`	`foreach ($this->parentsDirectoryDownward($fileRealPath) as $parentDirectory) {`
`62`	`62`	`if ($this->isIgnored($parentDirectory)) {`
`63`		`- $ignored = true;`
`64`		`-`
`65`	`63`	`// rules in ignored directories are ignored, no need to check further.`
`66`	`64`	`break;`
`67`	`65`	`}`