upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-26 08:38:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 30

Fixed array_combine for PHP 5.3

Browse source
This commit is contained in:
Vincent Petry 2014-06-11 19:13:49 +02:00
parent 67413e3ada
commit 4e4c2b04c8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/appframework/utility/controllermethodreflector.php
View file

@ -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()) {