Fix Reflector exception when a parameter name starts with another par…

…ameter's name
brick · Apr 15, 2023 · ea2aa6d · ea2aa6d
1 parent 84c9880
commit ea2aa6d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Reflection/Reflector.php b/src/Reflection/Reflector.php
@@ -146,7 +146,7 @@ private function getParameterTypeFromDocComment(ReflectionParameter $parameter):
             return null;
         }
 
-        $pattern = '/@param(.*)\$' . $parameter->getName() . '/';
+        $pattern = '/@param(.*)\$' . $parameter->getName() . '\W/';
 
         /** @var list<array{string}> $matches */
         preg_match_all($pattern, $docComment, $matches, PREG_SET_ORDER);

diff --git a/tests/Classes/KitchenSink.php b/tests/Classes/KitchenSink.php
@@ -258,6 +258,18 @@ public function multipleDocblockTypes(
     ): void {
     }
 
+    /**
+     * @param int[] $a
+     * @param string[] $ab
+     */
+    public function parameterNameThatStartsWithAnotherParametersName(
+        #[ExpectParameterType('int[]')]
+        array $a,
+        #[ExpectParameterType('string[]')]
+        array $ab,
+    ): void {
+    }
+
     /**
      * @param (Countable&Traversable)|null $b
      */