Fix 41223 issue "**/vendor/**"

mvorisek · mvorisek · commit b88efcb6acde · 2021-05-15T20:17:15.000+02:00
diff --git a/src/Symfony/Component/Finder/Gitignore.php b/src/Symfony/Component/Finder/Gitignore.php
@@ -68,20 +68,16 @@ private static function lineToRegex(string $gitignoreLine): string
             $isAbsolute = false;
         }
 
-        $parts = array_map(function (string $v): string {
-            $v = preg_quote(str_replace('\\', '', $v), '~');
-            $v = preg_replace_callback('~\\\\\[([^\[\]]*)\\\\\]~', function (array $matches): string {
-                return '['.str_replace('\\-', '-', $matches[1]).']';
-            }, $v);
-            $v = preg_replace('~\\\\\*\\\\\*~', '[^/]+(?:/[^/]+)*', $v);
-            $v = preg_replace('~\\\\\*~', '[^/]*', $v);
-            $v = preg_replace('~\\\\\?~', '[^/]', $v);
-
-            return $v;
-        }, explode('/', $gitignoreLine));
+        $regex = preg_quote(str_replace('\\', '', $gitignoreLine), '~');
+        $regex = preg_replace_callback('~\\\\\[([^\[\]]*)\\\\\]~', function (array $matches): string {
+            return '['.str_replace('\\-', '-', $matches[1]).']';
+        }, $regex);
+        $regex = preg_replace('~(?:(?:\\\\\*){2,}/?)+~', '.*', $regex);
+        $regex = preg_replace('~\\\\\*~', '[^/]*', $regex);
+        $regex = preg_replace('~\\\\\?~', '[^/]', $regex);
 
         return ($isAbsolute ? '' : '(?:[^/]+/)*')
-            .implode('/', $parts)
-            .('' !== end($parts) ? '(?:$|/)' : '');
+            .$regex
+            .('/' !== substr($gitignoreLine, -1) ? '(?:$|/)' : '');
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/GitignoreTest.php b/src/Symfony/Component/Finder/Tests/GitignoreTest.php
@@ -88,9 +88,9 @@ public function provider(): array
                 [],
             ],
             [
-                ['/a', 'm/*'],
-                ['a', 'a/b', 'a/b/c', 'm/'],
-                ['aa', 'm', 'b/m', 'b/m/'],
+                ['/a', 'm/*', 'o/**'],
+                ['a', 'a/b', 'a/b/c', 'm/', 'o/'],
+                ['aa', 'm', 'b/m', 'b/m/', 'o', 'b/o', 'b/o/'],
             ],
             [
                 ['a', '!x'],
@@ -280,6 +280,34 @@ public function provider(): array
                 ['example/test', 'example/example.txt2', 'example/packages/foo.yaml'],
                 ['example/example.txt', 'example/packages', 'example/packages/'],
             ],
+            [
+                [
+                    '*/vendor/*',
+                ],
+                ['a/vendor/', 'a/vendor/b', 'a/vendor/b/c'],
+                ['a', 'vendor', 'vendor/', 'a/vendor', 'a/b/vendor', 'a/b/vendor/c'],
+            ],
+            [
+                [
+                    '**/vendor/**',
+                ],
+                ['vendor/', 'vendor/a', 'vendor/a/b', 'a/b/vendor/c/d'],
+                ['a', 'vendor', 'a/vendor', 'a/b/vendor'],
+            ],
+            [
+                [
+                    '***/***/vendor/*****/*****',
+                ],
+                ['vendor/', 'vendor/a', 'vendor/a/b', 'a/b/vendor/c/d'],
+                ['a', 'vendor', 'a/vendor', 'a/b/vendor'],
+            ],
+            [
+                [
+                    '**vendor**',
+                ],
+                ['vendor', 'vendor/', 'vendor/a', 'vendor/a/b', 'a/vendor', 'a/b/vendor', 'a/b/vendor/c/d'],
+                ['a'],
+            ],
         ];
 
         return $cases;
