summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-01-17 14:22:25 +0100
committerBjoern Schiessle <bjoern@schiessle.org>2017-01-18 15:25:16 +0100
commit29a0a239183c9a2b8ab89b32b7ce5afde922159b (patch)
tree39ea27fa2b4cc3a86bc42fa98abcf0cdbf454472 /lib
parentdf296249d6ca4c9980bb23acdb6d9353d0d69996 (diff)
downloadnextcloud-server-29a0a239183c9a2b8ab89b32b7ce5afde922159b.tar.gz
nextcloud-server-29a0a239183c9a2b8ab89b32b7ce5afde922159b.zip
Fix the regex for annotations with values
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/AppFramework/Utility/ControllerMethodReflector.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/AppFramework/Utility/ControllerMethodReflector.php b/lib/private/AppFramework/Utility/ControllerMethodReflector.php
index 33a117d8121..9f653b0384e 100644
--- a/lib/private/AppFramework/Utility/ControllerMethodReflector.php
+++ b/lib/private/AppFramework/Utility/ControllerMethodReflector.php
@@ -55,7 +55,7 @@ class ControllerMethodReflector implements IControllerMethodReflector{
$docs = $reflection->getDocComment();
// extract everything prefixed by @ and first letter uppercase
- preg_match_all('/@([A-Z]\w+)/', $docs, $matches);
+ preg_match_all('/^\h+\*\h+@(?P<annotation>[A-Z]\w+)(\h+(?P<parameter>\w+))?$/m', $docs, $matches);
$this->annotations = $matches[1];
// extract type parameter information