Browse Source

make regex in controllermethodreflector.php compatible with PCRE 6.x

The syntax ?<...> seems to be only supported from PCRE 7.0 on. For
backwards-compability ?P<...> is used.
tags/v8.0.0alpha1
Philipp Knechtges 9 years ago
parent
commit
768aea57d3
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      lib/private/appframework/utility/controllermethodreflector.php

+ 1
- 1
lib/private/appframework/utility/controllermethodreflector.php View File

@@ -54,7 +54,7 @@ class ControllerMethodReflector {
$this->annotations = $matches[1];

// extract type parameter information
preg_match_all('/@param (?<type>\w+) \$(?<var>\w+)/', $docs, $matches);
preg_match_all('/@param (?P<type>\w+) \$(?P<var>\w+)/', $docs, $matches);
// this is just a fix for PHP 5.3 (array_combine raises warning if called with
// two empty arrays
if($matches['var'] === array() && $matches['type'] === array()) {

Loading…
Cancel
Save