Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.3' into 2.4

* 2.3:
  [Process] minor fixes
  Improve performance of getNextEmbedBlock by removing unnecessary preg_match and function calls.
  Avoid unnecessary line indentation calculation.
  Optimise Inline::evaluateScalar() for parsing strings.
  fixed CS
  fixed parsing Mongo DSN and added Test for it
  () is also a valid delimiter
  Adding PHP 5.6 to travis-ci tests
  Update BCryptPasswordEncoder.php
  [Validator] Removed PHP <5.3.3 specific code which is not officially supported.
  Fixed wrong redirect url if path contains some query parameters
  • Loading branch information...
commit d712f4a26737300b4d7546705a4fb15feeb3e96f 2 parents b6735d1 + df41b68
@fabpot fabpot authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 Expression/Regex.php
View
6 Expression/Regex.php
@@ -65,7 +65,11 @@ public static function create($expr)
$start = substr($m[1], 0, 1);
$end = substr($m[1], -1);
- if (($start === $end && !preg_match('/[*?[:alnum:] \\\\]/', $start)) || ($start === '{' && $end === '}')) {
+ if (
+ ($start === $end && !preg_match('/[*?[:alnum:] \\\\]/', $start))
+ || ($start === '{' && $end === '}')
+ || ($start === '(' && $end === ')')
+ ) {
return new self(substr($m[1], 1, -1), $m[2], $end);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.