Fixes symfony#28158

Apply PathFilterIterator only to directory root if path provided as non regex
erickskrauch · Sep 8, 2018 · 1718ab3 · 1718ab3
1 parent 004c315
commit 1718ab3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php b/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php
@@ -51,6 +51,6 @@ public function accept()
      */
     protected function toRegex($str)
     {
-        return $this->isRegex($str) ? $str : '/'.preg_quote($str, '/').'/';
+        return $this->isRegex($str) ? $str : '/^'.preg_quote($str, '/').'/';
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -1099,22 +1099,16 @@ public function getTestPathData()
                 array(
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
-                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
-                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat.copy',
                 ),
             ),
             array('A/B', 'foobar',
                 array(
                     //dirs
                     'A'.\DIRECTORY_SEPARATOR.'B',
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
-                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B',
-                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
                     //files
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
-                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat.copy',
-                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat.copy',
                 ),
             ),
             array('/^with space\//', 'foobar',
@@ -1124,7 +1118,7 @@ public function getTestPathData()
             ),
             array(
                 '/^A/',
-                array('a.dat', 'abc.dat'),
+                array('A/a.dat', 'A/B/C/abc.dat'),
                 array(
                     'A',
                     'A'.\DIRECTORY_SEPARATOR.'B',
@@ -1149,6 +1143,32 @@ public function getTestPathData()
                     'one'.\DIRECTORY_SEPARATOR.'b'.\DIRECTORY_SEPARATOR.'d.neon',
                 ),
             ),
+            array(
+                '',
+                'A',
+                array(
+                    'copy',
+                    'dolor.txt',
+                    'ipsum.txt',
+                    'lorem.txt',
+                    'one',
+                    'one'.\DIRECTORY_SEPARATOR.'a',
+                    'one'.\DIRECTORY_SEPARATOR.'b',
+                    'one'.\DIRECTORY_SEPARATOR.'b'.\DIRECTORY_SEPARATOR.'c.neon',
+                    'one'.\DIRECTORY_SEPARATOR.'b'.\DIRECTORY_SEPARATOR.'d.neon',
+                    'copy'.\DIRECTORY_SEPARATOR.'A',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'a.dat.copy',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat.copy',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat.copy',
+                    'r+e.gex[c]a(r)s',
+                    'r+e.gex[c]a(r)s'.\DIRECTORY_SEPARATOR.'dir',
+                    'r+e.gex[c]a(r)s'.\DIRECTORY_SEPARATOR.'dir'.\DIRECTORY_SEPARATOR.'bar.dat',
+                    'with space',
+                    'with space'.\DIRECTORY_SEPARATOR.'foo.txt',
+                ),
+            ),
         );
     }
 

diff --git a/src/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php
@@ -70,9 +70,9 @@ public function getTestFilterData()
             array($inner, array('/^A\/B\/C/'), array(), array('abc.dat')),
             array($inner, array('/A\/B\/C/'),  array(), array('abc.dat', 'abc.dat.copy')),
 
-            array($inner, array('A'),      array(), array('abc.dat', 'ab.dat', 'a.dat', 'abc.dat.copy', 'ab.dat.copy', 'a.dat.copy')),
-            array($inner, array('A/B'),    array(), array('abc.dat', 'ab.dat', 'abc.dat.copy', 'ab.dat.copy')),
-            array($inner, array('A/B/C'),  array(), array('abc.dat', 'abc.dat.copy')),
+            array($inner, array('A'),      array(), array('abc.dat', 'ab.dat', 'a.dat')),
+            array($inner, array('A/B'),    array(), array('abc.dat', 'ab.dat')),
+            array($inner, array('A/B/C'),  array(), array('abc.dat')),
 
             array($inner, array('copy/A'),      array(), array('abc.dat.copy', 'ab.dat.copy', 'a.dat.copy')),
             array($inner, array('copy/A/B'),    array(), array('abc.dat.copy', 'ab.dat.copy')),