Moved inline annotation parsing to the DocBlock type

sebastianbergmann · Sep 7, 2019 · a5716b8 · a5716b8
1 parent 38b7288
commit a5716b8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 19 deletions.
diff --git a/src/Annotation/DocBlock.php b/src/Annotation/DocBlock.php
@@ -235,6 +235,32 @@ public function getProvidedData() : ?array
         return $data;
     }
 
+    /**
+     * @psalm-return array<string, array{line: int, value: string}>
+     */
+    public function getInlineAnnotations() : array
+    {
+        $code        = \file($this->reflector->getFileName());
+        $lineNumber  = $this->reflector->getStartLine();
+        $startLine   = $this->reflector->getStartLine() - 1;
+        $endLine     = $this->reflector->getEndLine() - 1;
+        $codeLines   = \array_slice($code, $startLine, $endLine - $startLine + 1);
+        $annotations = [];
+
+        foreach ($codeLines as $line) {
+            if (\preg_match('#/\*\*?\s*@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?\*/$#m', $line, $matches)) {
+                $annotations[\strtolower($matches['name'])] = [
+                    'line'  => $lineNumber,
+                    'value' => $matches['value'],
+                ];
+            }
+
+            $lineNumber++;
+        }
+
+        return $annotations;
+    }
+
     private function parseSymbolAnnotations() : array
     {
         $annotations = [];

diff --git a/src/Util/Test.php b/src/Util/Test.php
@@ -436,25 +436,8 @@ public static function getInlineAnnotations(string $className, string $methodNam
             );
         }
 
-        $code        = \file($method->getFileName());
-        $lineNumber  = $method->getStartLine();
-        $startLine   = $method->getStartLine() - 1;
-        $endLine     = $method->getEndLine() - 1;
-        $methodLines = \array_slice($code, $startLine, $endLine - $startLine + 1);
-        $annotations = [];
-
-        foreach ($methodLines as $line) {
-            if (\preg_match('#/\*\*?\s*@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?\*/$#m', $line, $matches)) {
-                $annotations[\strtolower($matches['name'])] = [
-                    'line'  => $lineNumber,
-                    'value' => $matches['value'],
-                ];
-            }
-
-            $lineNumber++;
-        }
-
-        return $annotations;
+        return DocBlock::ofFunction($method)
+            ->getInlineAnnotations();
     }
 
     // @TODO remove