[Finder] Fixed expression classes.

symfony · Oct 29, 2012 · 6258d12 · 6258d12
1 parent 5c6dbeb
commit 6258d12
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 27 deletions.
diff --git a/src/Symfony/Component/Finder/Expression/Expression.php b/src/Symfony/Component/Finder/Expression/Expression.php
@@ -86,6 +86,26 @@ public function getType()
         return $this->value->getType();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function prepend($expr)
+    {
+        $this->value->prepend($expr);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function append($expr)
+    {
+        $this->value->append($expr);
+
+        return $this;
+    }
+
     /**
      * @return bool
      */

diff --git a/src/Symfony/Component/Finder/Expression/Glob.php b/src/Symfony/Component/Finder/Expression/Glob.php
@@ -61,6 +61,26 @@ public function isCaseSensitive()
         return true;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function prepend($expr)
+    {
+        $this->pattern = $expr.$this->pattern;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function append($expr)
+    {
+        $this->pattern .= $expr;
+
+        return $this;
+    }
+
     /**
      * @param bool $strictLeadingDot
      * @param bool $strictWildcardSlash

diff --git a/src/Symfony/Component/Finder/Expression/Regex.php b/src/Symfony/Component/Finder/Expression/Regex.php
@@ -66,7 +66,7 @@ public static function create($expr)
             $end   = substr($m[1], -1);
 
             if (($start === $end && !preg_match('/[*?[:alnum:] \\\\]/', $start)) || ($start === '{' && $end === '}')) {
-                return new self(substr($m[1], 1, -1), $m[2]);
+                return new self(substr($m[1], 1, -1), $m[2], $end);
             }
         }
 
@@ -76,9 +76,15 @@ public static function create($expr)
     /**
      * @param string $pattern
      * @param string $options
+     * @param string $delimiter
      */
-    public function __construct($pattern, $options = '')
+    public function __construct($pattern, $options = '', $delimiter = null)
     {
+        if (null !== $delimiter) {
+            // removes delimiter escaping
+            $pattern = str_replace('\\'.$delimiter, $delimiter, $pattern);
+        }
+
         $this->parsePattern($pattern);
         $this->options = $options;
     }
@@ -109,7 +115,7 @@ public function renderPattern()
     {
         return ($this->startFlag ? self::START_FLAG : '')
             .($this->startJoker ? self::JOKER : '')
-            .$this->pattern
+            .str_replace(self::BOUNDARY, '\\'.self::BOUNDARY, $this->pattern)
             .($this->endJoker ? self::JOKER : '')
             .($this->endFlag ? self::END_FLAG : '');
     }
@@ -130,6 +136,26 @@ public function getType()
         return Expression::TYPE_REGEX;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function prepend($expr)
+    {
+        $this->pattern = $expr.$this->pattern;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function append($expr)
+    {
+        $this->pattern .= $expr;
+
+        return $this;
+    }
+
     /**
      * @param string $option
      *
@@ -246,30 +272,6 @@ public function hasEndJoker()
         return $this->endJoker;
     }
 
-    /**
-     * @param string $expr
-     *
-     * @return Regex
-     */
-    public function prepend($expr)
-    {
-        $this->pattern = $expr.$this->pattern;
-
-        return $this;
-    }
-
-    /**
-     * @param string $expr
-     *
-     * @return Regex
-     */
-    public function append($expr)
-    {
-        $this->pattern .= $expr;
-
-        return $this;
-    }
-
     /**
      * @param array $replacements
      *

diff --git a/src/Symfony/Component/Finder/Expression/ValueInterface.php b/src/Symfony/Component/Finder/Expression/ValueInterface.php
@@ -43,4 +43,18 @@ function isCaseSensitive();
      * @return int
      */
     function getType();
+
+    /**
+     * @param string $expr
+     *
+     * @return ValueInterface
+     */
+    public function prepend($expr);
+
+    /**
+     * @param string $expr
+     *
+     * @return ValueInterface
+     */
+    public function append($expr);
 }