[Pkg-owncloud-commits] [owncloud] 20/90: make regex in controllermethodreflector.php compatible with PCRE 6.x

David Prévot taffit at moszumanska.debian.org
Fri Feb 6 21:10:41 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 533e8e14b64aeea8f3190eaaff208ed9a533dd13
Author: Philipp Knechtges <philipp-dev at knechtges.com>
Date:   Sat Dec 13 02:16:37 2014 +0100

    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 d5cf2f5..045bfc8 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 (?<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()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list