Browse Source

Allow multiple whitespace in type hints in AppFramework

Type hints such as `@param bool     $doSomething` will now correctly get
parsed, allowing for alignment of docblock parameters if the app developer so
wishes.
remotes/origin/poc-doctrine-migrations
Robin McCorkell 11 years ago
parent
commit
04b6f67f07
  1. 2
      lib/private/appframework/utility/controllermethodreflector.php

2
lib/private/appframework/utility/controllermethodreflector.php

@ -59,7 +59,7 @@ class ControllerMethodReflector implements IControllerMethodReflector{
$this->annotations = $matches[1];
// extract type parameter information
preg_match_all('/@param (?P<type>\w+) \$(?P<var>\w+)/', $docs, $matches);
preg_match_all('/@param\h+(?P<type>\w+)\h+\$(?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()) {

Loading…
Cancel
Save