feature #15962 [Finder] simplified code (fabpot)

fabpot · fabpot · commit 779d6dc7f425 · 2015-09-28T13:14:02.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Finder] simplified code | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 4fa3eaf [Finder] simplified code
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,22 @@ 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);
+            }
+
+            foreach (array(array('{', '}'), array('(', ')'), array('[', ']'), array('<', '>')) as $delimiters) {
+                if ($start === $delimiters[0] && $end === $delimiters[1]) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 
     /**
diff --git a/src/Symfony/Component/Finder/Tests/Expression/ExpressionTest.php b/src/Symfony/Component/Finder/Tests/Expression/ExpressionTest.php
@@ -13,6 +13,9 @@
 
 use Symfony\Component\Finder\Expression\Expression;
 
+/**
+ * @group legacy
+ */
 class ExpressionTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Symfony/Component/Finder/Tests/Expression/GlobTest.php b/src/Symfony/Component/Finder/Tests/Expression/GlobTest.php
@@ -13,6 +13,9 @@
 
 use Symfony\Component\Finder\Expression\Expression;
 
+/**
+ * @group legacy
+ */
 class GlobTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Symfony/Component/Finder/Tests/Expression/RegexTest.php b/src/Symfony/Component/Finder/Tests/Expression/RegexTest.php
@@ -13,6 +13,9 @@
 
 use Symfony\Component\Finder\Expression\Expression;
 
+/**
+ * @group legacy
+ */
 class RegexTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
@@ -38,6 +38,9 @@ public function getIsRegexFixtures()
             array('/foo/imsxu', true, 'valid regex with multiple modifiers'),
             array('#foo#', true, '"#" is a valid delimiter'),
             array('{foo}', true, '"{,}" is a valid delimiter pair'),
+            array('[foo]', true, '"[,]" is a valid delimiter pair'),
+            array('(foo)', true, '"(,)" is a valid delimiter pair'),
+            array('<foo>', true, '"<,>" is a valid delimiter pair'),
             array('*foo.*', false, '"*" is not considered as a valid delimiter'),
             array('?foo.?', false, '"?" is not considered as a valid delimiter'),
         );

-Original file line number
+Diff line change
 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 <[email protected]>
  */
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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Finder\Expression\Expression;`
`15`	`15`
	`16`	`+/**`
	`17`	`+ * @group legacy`
	`18`	`+ */`
`16`	`19`	`class ExpressionTest extends \PHPUnit_Framework_TestCase`
`17`	`20`	`{`
`18`	`21`	`/**`