Merge branch '2.3' into 2.7

fabpot · fabpot · commit 6afceb4a565c · 2016-01-25T17:36:11.000+01:00
* 2.3:
  Escape the delimiter in Glob::toRegex
diff --git a/Glob.php b/Glob.php
@@ -66,7 +66,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
`@@ -66,7 +66,7 @@ public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardS`
`66`	`66`	`$firstByte = true;`
`67`	`67`	`}`
`68`	`68`
`69`		`- if ('.' === $car \|\| '(' === $car \|\| ')' === $car \|\| '\|' === $car \|\| '+' === $car \|\| '^' === $car \|\| '$' === $car) {`
	`69`	`+ if ($delimiter === $car \|\| '.' === $car \|\| '(' === $car \|\| ')' === $car \|\| '\|' === $car \|\| '+' === $car \|\| '^' === $car \|\| '$' === $car) {`
`70`	`70`	`$regex .= "\\$car";`
`71`	`71`	`} elseif ('*' === $car) {`
`72`	`72`	`$regex .= $escaping ? '\\' : ($strictWildcardSlash ? '[^/]' : '.*');`