[Finder] Fixed gnu find regex name filtering problems.

jfsimon · jfsimon · commit ef0ebb8156b1 · 2012-08-03T08:32:37.000+02:00
diff --git a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php
@@ -152,13 +152,17 @@ private function buildNamesFiltering(Command $command, array $names, $not = fals
         foreach ($names as $i => $name) {
             $expr = Expression::create($name);
 
-            // Fixes 'not search' regex problem.
+            // Fixes 'not search' and 'fuls path matching' regex problems.
+            // - Jokers '.' are replaced by [^/].
+            // - We add '[^/]*' before and after regex (if no ^|$ flags are present).
             if ($expr->isRegex()) {
                 $regex = $expr->getRegex();
-                $regex->prepend($regex->hasStartFlag() ? '/' : '/.*')->setStartFlag(false)->setStartJoker(true);
-
-                if (!$regex->hasEndFlag()) {
-                    $regex->setEndJoker(true);
+                $regex->prepend($regex->hasStartFlag() ? '/' : '/[^/]*')
+                    ->setStartFlag(false)
+                    ->setStartJoker(true)
+                    ->replaceJokers('[^/]');
+                if (!$regex->hasEndFlag() || $regex->hasEndJoker()) {
+                    $regex->setEndJoker(false)->append('[^/]*');
                 }
             }
 
diff --git a/src/Symfony/Component/Finder/Expression/Regex.php b/src/Symfony/Component/Finder/Expression/Regex.php
@@ -270,6 +270,25 @@ public function append($expr)
         return $this;
     }
 
+    /**
+     * @param array $replacements
+     *
+     * @return Regex
+     */
+    public function replaceJokers($replacement)
+    {
+        $replace = function ($subject) use ($replacement) {
+            $subject = $subject[0];
+            $replace = 0 === substr_count($subject, '\\') % 2;
+
+            return $replace ? str_replace('.', $replacement, $subject) : $subject;
+        };
+
+        $this->pattern = preg_replace_callback('~[\\\\]*\\.~', $replace, $this->pattern);
+
+        return $this;
+    }
+
     /**
      * @param string $pattern
      */
diff --git a/src/Symfony/Component/Finder/Tests/Expression/RegexTest.php b/src/Symfony/Component/Finder/Tests/Expression/RegexTest.php
@@ -78,6 +78,17 @@ public function testMixFlagsAndJokers()
         $this->assertEquals('~^.*abc.*$~is', $expr->render());
     }
 
+    /**
+     * @dataProvider getReplaceJokersTestData
+     */
+    public function testReplaceJokers($regex, $expected)
+    {
+        $expr = new Expression($regex);
+        $expr = $expr->getRegex()->replaceJokers('@');
+
+        $this->assertEquals($expected, $expr->renderPattern());
+    }
+
     public function getHasFlagsData()
     {
         return array(
@@ -119,4 +130,14 @@ public function getSetJokersData()
             array('~abc~', true, true, '~.*abc.*~'),
         );
     }
+
+    public function getReplaceJokersTestData()
+    {
+        return array(
+            array('~.abc~', '@abc'),
+            array('~\\.abc~', '\\.abc'),
+            array('~\\\\.abc~', '\\\\@abc'),
+            array('~\\\\\\.abc~', '\\\\\\.abc'),
+        );
+    }
 }
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -133,6 +133,18 @@ public function testNotName($adapter)
         $this->assertIterator(array(), $finder->in(self::$tmpDir)->getIterator());
     }
 
+    /**
+     * @dataProvider getRegexNameTestData
+     *
+     * @group regexName
+     */
+    public function testRegexName($adapter, $regex)
+    {
+        $finder = $this->buildFinder($adapter);
+        $finder->name($regex);
+        $this->assertIterator($this->toAbsolute(array('test.py', 'test.php')), $finder->in(self::$tmpDir)->getIterator());
+    }
+
     /**
      * @dataProvider getAdaptersTestData
      */
@@ -595,14 +607,17 @@ public function getContainsTestData()
             array('ipsum dolor sit amet', '/^IPSUM/m', array('lorem.txt')),
         );
 
-        $data = array();
-        foreach ($this->getValidAdapters() as $adapter) {
-            foreach ($tests as $test) {
-                $data[] = array_merge(array($adapter), $test);
-            }
-        }
+        return $this->buildTestData($tests);
+    }
 
-        return $data;
+    public function getRegexNameTestData()
+    {
+        $tests = array(
+            array('~.+\\.p.+~i'),
+            array('~t.*s~i'),
+        );
+
+        return $this->buildTestData($tests);
     }
 
     private function buildFinder(Adapter\AdapterInterface $adapter)
@@ -619,4 +634,16 @@ private function getValidAdapters()
             function (Adapter\AdapterInterface $adapter)  { return $adapter->isSupported(); }
         );
     }
+
+    private function buildTestData(array $tests)
+    {
+        $data = array();
+        foreach ($this->getValidAdapters() as $adapter) {
+            foreach ($tests as $test) {
+                $data[] = array_merge(array($adapter), $test);
+            }
+        }
+
+        return $data;
+    }
 }
