From 768aea57d3cef405ff1e01731fd31af5c997df99 Mon Sep 17 00:00:00 2001 From: Philipp Knechtges Date: Sat, 13 Dec 2014 02:16:37 +0100 Subject: [PATCH] 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. --- lib/private/appframework/utility/controllermethodreflector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php index c49dd80091e..8ad35ed35c2 100644 --- a/lib/private/appframework/utility/controllermethodreflector.php +++ b/lib/private/appframework/utility/controllermethodreflector.php @@ -54,7 +54,7 @@ class ControllerMethodReflector { $this->annotations = $matches[1]; // extract type parameter information - preg_match_all('/@param (?\w+) \$(?\w+)/', $docs, $matches); + preg_match_all('/@param (?P\w+) \$(?P\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()) { -- 2.39.5