Helpers::parseAnnotation() improved regexp

nette · Oct 3, 2018 · 485a875 · 485a875
1 parent cf8afe5
commit 485a875
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/DI/Helpers.php b/src/DI/Helpers.php
@@ -215,8 +215,8 @@ public static function parseAnnotation(\Reflector $ref, string $name): ?string
  if (!Reflection::areCommentsAvailable()) {
  throw new Nette\InvalidStateException('You have to enable phpDoc comments in opcode cache.');
  }
- $name = preg_quote($name, '#');
- if ($ref->getDocComment() && preg_match("#[\\s*]@$name(?:\\s++([^@]\\S*)?|$)#", trim($ref->getDocComment(), '/*'), $m)) {
+ $re = '#[\s*]@' . preg_quote($name, '#') . '(?=\s|$)(?:[ \t]+([^@\s]\S*))?#';
+ if ($ref->getDocComment() && preg_match($re, trim($ref->getDocComment(), '/*'), $m)) {
  return $m[1] ?? '';
  }
  return null;

diff --git a/tests/DI/Helpers.parseAnnotation().phpt b/tests/DI/Helpers.parseAnnotation().phpt
@@ -36,3 +36,29 @@ class TestClass2
 $rc = new ReflectionClass('TestClass2');
 
 Assert::same('', Helpers::parseAnnotation($rc, 'return'));
+
+
+/** @return
+var
+*/
+class TestClass3
+{
+}
+
+$rc = new ReflectionClass('TestClass3');
+
+Assert::same('', Helpers::parseAnnotation($rc, 'return'));
+
+
+/**
+ * @inject@var
+ */
+class TestClass4
+{
+}
+
+$rc = new ReflectionClass('TestClass4');
+
+Assert::same(null, Helpers::parseAnnotation($rc, 'inject'));
+Assert::same(null, Helpers::parseAnnotation($rc, 'injec'));
+Assert::same(null, Helpers::parseAnnotation($rc, 'var'));