merged branch jfsimon/issue-6586 (PR #7190)

fabpot · fabpot · commit 6c966c756567 · 2013-02-26T17:28:03.000+01:00
This PR was squashed before being merged into the master branch (closes #7190). Commits ------- 6e0d93e [Finder] Adds expandable globs support to shell adapters Discussion ---------- [Finder] Adds expandable globs support to shell adapters As expandable globs, i mean glob following `*.{a,b}` syntax. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #6586
diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
@@ -154,6 +154,11 @@ private function buildNamesFiltering(Command $command, array $names, $not = fals
         foreach ($names as $i => $name) {
             $expr = Expression::create($name);
 
+            // Find does not support expandable globs ("*.{a,b}" syntax).
+            if ($expr->isGlob() && $expr->getGlob()->isExpandable()) {
+                $expr = Expression::create($expr->getGlob()->toRegex(false));
+            }
+
             // Fixes 'not search' and 'full path matching' regex problems.
             // - Jokers '.' are replaced by [^/].
             // - We add '[^/]*' before and after regex (if no ^|$ flags are present).
@@ -197,6 +202,11 @@ private function buildPathsFiltering(Command $command, $dir, array $paths, $not
         foreach ($paths as $i => $path) {
             $expr = Expression::create($path);
 
+            // Find does not support expandable globs ("*.{a,b}" syntax).
+            if ($expr->isGlob() && $expr->getGlob()->isExpandable()) {
+                $expr = Expression::create($expr->getGlob()->toRegex(false));
+            }
+
             // Fixes 'not search' regex problems.
             if ($expr->isRegex()) {
                 $regex = $expr->getRegex();
diff --git a/src/Symfony/Component/Finder/Expression/Expression.php b/src/Symfony/Component/Finder/Expression/Expression.php
@@ -122,6 +122,20 @@ public function isGlob()
         return self::TYPE_GLOB === $this->value->getType();
     }
 
+    /**
+     * @throws \LogicException
+     *
+     * @return Glob
+     */
+    public function getGlob()
+    {
+        if (self::TYPE_GLOB !== $this->value->getType()) {
+            throw new \LogicException('Regex cant be transformed to glob.');
+        }
+
+        return $this->value;
+    }
+
     /**
      * @return Regex
      */
diff --git a/src/Symfony/Component/Finder/Expression/Glob.php b/src/Symfony/Component/Finder/Expression/Glob.php
@@ -81,6 +81,17 @@ public function append($expr)
         return $this;
     }
 
+    /**
+     * Tests if glob is expandable ("*.{a,b}" syntax).
+     *
+     * @return bool
+     */
+    public function isExpandable()
+    {
+        return false !== strpos($this->pattern, '{')
+            && false !== strpos($this->pattern, '}');
+    }
+
     /**
      * @param bool $strictLeadingDot
      * @param bool $strictWildcardSlash
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -106,6 +106,10 @@ public function testName($adapter)
         $finder = $this->buildFinder($adapter);
         $finder->name('~\\.php$~i');
         $this->assertIterator($this->toAbsolute(array('test.php')), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder($adapter);
+        $finder->name('test.p{hp,y}');
+        $this->assertIterator($this->toAbsolute(array('test.php', 'test.py')), $finder->in(self::$tmpDir)->getIterator());
     }
 
     /**
@@ -128,6 +132,12 @@ public function testNotName($adapter)
         $finder->notName('*.php');
         $finder->notName('*.py');
         $this->assertIterator(array(), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder($adapter);
+        $finder->name('test.ph*');
+        $finder->name('test.py');
+        $finder->notName('*.p{hp,y}');
+        $this->assertIterator(array(), $finder->in(self::$tmpDir)->getIterator());
     }
 
     /**
