bug #17526 Escape the delimiter in Glob::toRegex (javiereguiluz)

fabpot · fabpot · commit 8fd6ca96b71a · 2016-01-25T17:35:29.000+01:00
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #17526). Discussion ---------- Escape the delimiter in Glob::toRegex | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #13531 | License | MIT | Doc PR | - Commits ------- bb3964b Escape the delimiter in Glob::toRegex
diff --git a/Glob.php b/Glob.php
@@ -65,7 +65,7 @@ public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardS
                 $firstByte = true;
             }
 
-            if ('.' === $car || '(' === $car || ')' === $car || '|' === $car || '+' === $car || '^' === $car || '$' === $car) {
+            if ($delimiter === $car || '.' === $car || '(' === $car || ')' === $car || '|' === $car || '+' === $car || '^' === $car || '$' === $car) {
                 $regex .= "\\$car";
             } elseif ('*' === $car) {
                 $regex .= $escaping ? '\\*' : ($strictWildcardSlash ? '[^/]*' : '.*');

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardS`
`65`	`65`	`$firstByte = true;`
`66`	`66`	`}`
`67`	`67`
`68`		`- if ('.' === $car \|\| '(' === $car \|\| ')' === $car \|\| '\|' === $car \|\| '+' === $car \|\| '^' === $car \|\| '$' === $car) {`
	`68`	`+ if ($delimiter === $car \|\| '.' === $car \|\| '(' === $car \|\| ')' === $car \|\| '\|' === $car \|\| '+' === $car \|\| '^' === $car \|\| '$' === $car) {`
`69`	`69`	`$regex .= "\\$car";`
`70`	`70`	`} elseif ('*' === $car) {`
`71`	`71`	`$regex .= $escaping ? '\\' : ($strictWildcardSlash ? '[^/]' : '.*');`