merged branch vicb/finder/regex (PR symfony#4699)

fabpot · fabpot · commit dd1115a286c8 · 2012-07-02T09:47:07.000+02:00
Commits ------- 4d09fe6 [Finder] '*' and '?' are considered are glob pattern rather than delimiters (fix symfony#4664) Discussion ---------- [Finder] '*' and '?' are considered are glob pattern rather than delimit... ...ers (fix symfony#4664)
diff --git a/src/Symfony/Component/Finder/CHANGELOG.md b/src/Symfony/Component/Finder/CHANGELOG.md
@@ -12,3 +12,5 @@ CHANGELOG
  * added searching based on the file content via Finder::contains() and
    Finder::notContains()
  * added support for the != operator in the Comparator
+ * [BC BREAK] filter expressions (used for file name and content) are no more
+   considered as regexps but glob patterns when they are enclosed in '*' or '?'
diff --git a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
@@ -58,7 +58,7 @@ protected function isRegex($str)
             $end = substr($m[1], -1);
 
             if ($start === $end) {
-                return !preg_match('/[[:alnum:] \\\\]/', $start);
+                return !preg_match('/[*?[:alnum:] \\\\]/', $start);
             }
 
             if ($start === '{' && $end === '}') {
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
@@ -38,6 +38,8 @@ 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.*', false, '"*" is not considered as a valid delimiter'),
+            array('?foo.?', false, '"?" is not considered as a valid delimiter'),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected function isRegex($str)`
`58`	`58`	`$end = substr($m[1], -1);`
`59`	`59`
`60`	`60`	`if ($start === $end) {`
`61`		`- return !preg_match('/[[:alnum:] \\\\]/', $start);`
	`61`	`+ return !preg_match('/[*?[:alnum:] \\\\]/', $start);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if ($start === '{' && $end === '}') {`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ public function getIsRegexFixtures()`
`38`	`38`	`array('/foo/imsxu', true, 'valid regex with multiple modifiers'),`
`39`	`39`	`array('#foo#', true, '"#" is a valid delimiter'),`
`40`	`40`	`array('{foo}', true, '"{,}" is a valid delimiter pair'),`
	`41`	`+ array('foo.', false, '"*" is not considered as a valid delimiter'),`
	`42`	`+ array('?foo.?', false, '"?" is not considered as a valid delimiter'),`
`41`	`43`	`);`
`42`	`44`	`}`
`43`	`45`	`}`