[Debug][DebugClassLoader] Match callable() type for parameters not defined in sub classes

fancyweb · fancyweb · commit 2957e8b01819 · 2019-01-25T20:28:19.000+01:00
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -375,7 +375,7 @@ public function checkAnnotations(\ReflectionClass $refl, $class)
             if ($finalOrInternal || $method->isConstructor() || false === \strpos($doc, '@param') || StatelessInvocation::class === $class) {
                 continue;
             }
-            if (!preg_match_all('#\n\s+\* @param (.*?)(?<= )\$([a-zA-Z0-9_\x7f-\xff]++)#', $doc, $matches, PREG_SET_ORDER)) {
+            if (!preg_match_all('#\n\s+\* @param (callable(?:\(.*\))? *|.*?)\$([a-zA-Z0-9_\x7f-\xff]++)#', $doc, $matches, PREG_SET_ORDER)) {
                 continue;
             }
             if (!isset(self::$annotatedParameters[$class][$method->name])) {
diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
@@ -287,6 +287,9 @@ class_exists(__NAMESPACE__.'\\Fixtures\SubClassWithAnnotatedParameters', true);
         $this->assertSame([
             'The "Symfony\Component\Debug\Tests\Fixtures\SubClassWithAnnotatedParameters::quzMethod()" method will require a new "Quz $quz" argument in the next major version of its parent class "Symfony\Component\Debug\Tests\Fixtures\ClassWithAnnotatedParameters", not defining it is deprecated.',
             'The "Symfony\Component\Debug\Tests\Fixtures\SubClassWithAnnotatedParameters::whereAmI()" method will require a new "bool $matrix" argument in the next major version of its parent class "Symfony\Component\Debug\Tests\Fixtures\InterfaceWithAnnotatedParameters", not defining it is deprecated.',
+            'The "Symfony\Component\Debug\Tests\Fixtures\SubClassWithAnnotatedParameters::iAmHere()" method will require a new "$noType" argument in the next major version of its parent class "Symfony\Component\Debug\Tests\Fixtures\InterfaceWithAnnotatedParameters", not defining it is deprecated.',
+            'The "Symfony\Component\Debug\Tests\Fixtures\SubClassWithAnnotatedParameters::iAmHere()" method will require a new "callable(\Throwable|null $reason, mixed $value) $callback" argument in the next major version of its parent class "Symfony\Component\Debug\Tests\Fixtures\InterfaceWithAnnotatedParameters", not defining it is deprecated.',
+            'The "Symfony\Component\Debug\Tests\Fixtures\SubClassWithAnnotatedParameters::iAmHere()" method will require a new "string $param" argument in the next major version of its parent class "Symfony\Component\Debug\Tests\Fixtures\InterfaceWithAnnotatedParameters", not defining it is deprecated.',
             'The "Symfony\Component\Debug\Tests\Fixtures\SubClassWithAnnotatedParameters::isSymfony()" method will require a new "true $yes" argument in the next major version of its parent class "Symfony\Component\Debug\Tests\Fixtures\ClassWithAnnotatedParameters", not defining it is deprecated.',
         ], $deprecations);
     }
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/InterfaceWithAnnotatedParameters.php b/src/Symfony/Component/Debug/Tests/Fixtures/InterfaceWithAnnotatedParameters.php
@@ -11,4 +11,12 @@ interface InterfaceWithAnnotatedParameters
      * @param bool $matrix
      */
     public function whereAmI();
+
+    /**
+     * @param       $noType
+     * @param callable(\Throwable|null $reason, mixed $value) $callback and a comment
+     * about this great param
+     * @param string                                          $param (comment with $dollar)
+     */
+    public function iAmHere();
 }
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/SubClassWithAnnotatedParameters.php b/src/Symfony/Component/Debug/Tests/Fixtures/SubClassWithAnnotatedParameters.php
@@ -21,4 +21,8 @@ public function quzMethod()
     public function whereAmI()
     {
     }
+
+    public function iAmHere()
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ public function checkAnnotations(\ReflectionClass $refl, $class)`
`375`	`375`	`if ($finalOrInternal \|\| $method->isConstructor() \|\| false === \strpos($doc, '@param') \|\| StatelessInvocation::class === $class) {`
`376`	`376`	`continue;`
`377`	`377`	`}`
`378`		`- if (!preg_match_all('#\n\s+\* @param (.*?)(?<= )\$([a-zA-Z0-9_\x7f-\xff]++)#', $doc, $matches, PREG_SET_ORDER)) {`
	`378`	`+ if (!preg_match_all('#\n\s+\* @param (callable(?:\(.\))? \|.*?)\$([a-zA-Z0-9_\x7f-\xff]++)#', $doc, $matches, PREG_SET_ORDER)) {`
`379`	`379`	`continue;`
`380`	`380`	`}`
`381`	`381`	`if (!isset(self::$annotatedParameters[$class][$method->name])) {`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,8 @@ public function quzMethod()`
`21`	`21`	`public function whereAmI()`
`22`	`22`	`{`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+ public function iAmHere()`
	`26`	`+ {`
	`27`	`+ }`
`24`	`28`	`}`