Add Regexp#matches().

framework/Refactor/lib/Horde/Refactor/Regexp.php

@@ -50,4 +50,16 @@ public function __toString()
     {
         return $this->_regexp;
     }
+
+    /**
+     * Returns whether this a string matches this regular expression.
+     *
+     * @param string $string  A string to match against.
+     *
+     * @return boolean  True if the string matches.
+     */
+    public function matches($string)
+    {
+        return (bool)preg_match($this, $string);
+    }
 }

framework/Refactor/lib/Horde/Refactor/Tokens.php

@@ -300,7 +300,7 @@ public function matches($token, $term = null)
             if (is_null($term)) {
                 return true;
             } elseif ($term instanceof Regexp) {
-                return (bool)preg_match($term, $current[1]);
+                return $term->matches($current[1]);
             } else {
                 return $current[1] == $term;
             }
@@ -312,7 +312,7 @@ public function matches($token, $term = null)
             return false;
         }
         if ($token instanceof Regexp) {
-            return (bool)preg_match($token, $current);
+            return $token->matches($current);
         }
         return $current == $token;
     }