Fixed array_combine for PHP 5.3

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php
index a1519c72809..d5cf2f52eb2 100644
--- a/lib/private/appframework/utility/controllermethodreflector.php
+++ b/lib/private/appframework/utility/controllermethodreflector.php
@@ -55,8 +55,13 @@ class ControllerMethodReflector {
 
 		// extract type parameter information
 		preg_match_all('/@param (?<type>\w+) \$(?<var>\w+)/', $docs, $matches);
-		$this->types = array_combine($matches['var'], $matches['type']);
-
+		// 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()) {
+			$this->types = array();
+		} else {
+			$this->types = array_combine($matches['var'], $matches['type']);
+		}
 		// get method parameters
 		foreach ($reflection->getParameters() as $param) {
 			if($param->isOptional()) {