[Finder] simplified code

fabpot · fabpot · commit 9c0f54da0214 · 2015-09-28T10:47:11.000+02:00
diff --git a/src/Symfony/Component/Finder/Expression/Expression.php b/src/Symfony/Component/Finder/Expression/Expression.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Finder\Expression;
 
+@trigger_error('The '.__NAMESPACE__.'\Expression class is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
diff --git a/src/Symfony/Component/Finder/Expression/Glob.php b/src/Symfony/Component/Finder/Expression/Glob.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Finder\Expression;
 
+@trigger_error('The '.__NAMESPACE__.'\Glob class is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+
 use Symfony\Component\Finder\Glob as FinderGlob;
 
 /**
diff --git a/src/Symfony/Component/Finder/Expression/Regex.php b/src/Symfony/Component/Finder/Expression/Regex.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Finder\Expression;
 
+@trigger_error('The '.__NAMESPACE__.'\Regex class is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
diff --git a/src/Symfony/Component/Finder/Expression/ValueInterface.php b/src/Symfony/Component/Finder/Expression/ValueInterface.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Finder\Expression;
 
+@trigger_error('The '.__NAMESPACE__.'\ValueInterface interface is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
diff --git a/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Finder\Iterator;
 
-use Symfony\Component\Finder\Expression\Expression;
+use Symfony\Component\Finder\Glob;
 
 /**
  * FilenameFilterIterator filters files by patterns (a regexp, a glob, or a string).
@@ -42,6 +42,6 @@ public function accept()
      */
     protected function toRegex($str)
     {
-        return Expression::create($str)->getRegex()->render();
+        return $this->isRegex($str) ? $str : Glob::toRegex($str);
     }
 }
diff --git a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Finder\Iterator;
 
-use Symfony\Component\Finder\Expression\Expression;
-
 /**
  * MultiplePcreFilterIterator filters files using patterns (regexps, globs or strings).
  *
@@ -87,7 +85,20 @@ protected function isAccepted($string)
      */
     protected function isRegex($str)
     {
-        return Expression::create($str)->isRegex();
+        if (preg_match('/^(.{3,}?)[imsxuADU]*$/', $str, $m)) {
+            $start = substr($m[1], 0, 1);
+            $end = substr($m[1], -1);
+
+            if ($start === $end) {
+                return !preg_match('/[*?[:alnum:] \\\\]/', $start);
+            }
+
+            if ($start === '{' && $end === '}') {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Finder\Iterator;`
`13`	`13`
`14`		`-use Symfony\Component\Finder\Expression\Expression;`
	`14`	`+use Symfony\Component\Finder\Glob;`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* FilenameFilterIterator filters files by patterns (a regexp, a glob, or a string).`
`@@ -42,6 +42,6 @@ public function accept()`
`42`	`42`	`*/`
`43`	`43`	`protected function toRegex($str)`
`44`	`44`	`{`
`45`		`- return Expression::create($str)->getRegex()->render();`
	`45`	`+ return $this->isRegex($str) ? $str : Glob::toRegex($str);`
`46`	`46`	`}`
`47`	`47`	`}`