Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-26 17:55:04 +02:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Merge pull request #8991 from owncloud/fix-php53-arraycombine

Browse Source 
Fixed array_combine for PHP 5.3
This commit is contained in:
Vincent Petry 2014-06-12 09:08:50 +02:00
commit 5def2a72dd
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()) {