fix: better parse end of {@link ...} blocks

Author: williamdes

src/Renderer/TwigExtension.php

@@ -154,15 +154,15 @@ public function parseDesc(array $context, ?string $desc, Reflection $classOrFunc
         $desc = str_replace(['<code>', '</code>'], ['```', '```'], $desc);
 
         $desc = (string) preg_replace_callback(
-            '/@see ([^ ]+)/',
+            '/@see ([^ ]+)/', // Match until a whitespace is found
             function ($match) use (&$classOrFunctionRefl): string {
                 return $this->transformContentsIntoLinks($match[1], $classOrFunctionRefl);
             },
             $desc
         );
 
         $desc = (string) preg_replace_callback(
-            '/\{@link ((?!\})(?<contents>[^ ]+))/',
+            '/\{@link (?!\})(?<contents>[^\r\n\t\f]+)\}/',
             function (array $match) use (&$classOrFunctionRefl): string {
                 $data = rtrim($match['contents'], '}');
                 return $this->transformContentsIntoLinks($data, $classOrFunctionRefl);

tests/Renderer/TwigExtensionTest.php

@@ -35,10 +35,22 @@ public function dataProviderParseDesc(): array
                 '<p><p>text</p></p>',
                 '<p><p>text</p></p>'
             ],
+            [
+                'Constructor. Set DB Object and set {@link $return_statements return_statements}.',
+                '<p>Constructor. Set DB Object and set $return_statements return_statements.</p>'
+            ],
+            [
+                'Constructor. Set DB Object and set {@link $return_statements return_statements}',
+                '<p>Constructor. Set DB Object and set $return_statements return_statements</p>'
+            ],
             [
                 'Hi {@link \PDO}',
                 '<p>Hi \PDO</p>'
             ],
+            [
+                'Hi {@link https://doctum.long-term.support}',
+                '<p>Hi <a href="https://doctum.long-term.support">https://doctum.long-term.support</a></p>'
+            ],
             [
                 'Hi {@link \PDO}',
                 '<p>Hi <a href="https://www.php.net/PDO">PDO</a></p>',
@@ -219,6 +231,11 @@ public function dataProviderTransformContentsIntoLinks(): array
         $ref4->setProject($project);
         $project->addClass($ref4);
         return [
+            [
+                'https://doctum.long-term.support',
+                'https://doctum.long-term.support',
+                $ref
+            ],
             [
                 '\PDO',
                 '[PDO](https://www.php.net/PDO)',
@@ -274,6 +291,16 @@ public function dataProviderTransformContentsIntoLinks(): array
                 'my_class',
                 new ClassReflection('my_class', 0)
             ],
+            [
+                '$return_statements return_statements.',
+                '$return_statements return_statements.',
+                new ClassReflection('my_class', 0)
+            ],
+            [
+                '$return_statements return_statements',
+                '$return_statements return_statements',
+                new ClassReflection('my_class', 0)
+            ],
         ];
     }