From 4e4c2b04c8a39b9d069acd38bf3654942ee0126d Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 11 Jun 2014 19:13:49 +0200 Subject: [PATCH] Fixed array_combine for PHP 5.3 --- .../appframework/utility/controllermethodreflector.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php index a1519c7280..d5cf2f52eb 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 (?\w+) \$(?\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()) {