[DependencyInjection][CheckTypeDeclarationsPass] Handle \Closure for callable

fancyweb · fancyweb · commit d6a7fbfbc3c9 · 2019-12-20T17:42:47.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -166,7 +166,7 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
                 return;
             }
 
-            if ('callable' === $type && method_exists($class, '__invoke')) {
+            if ('callable' === $type && (\Closure::class === $class || method_exists($class, '__invoke'))) {
                 return;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -681,4 +681,20 @@ public function testProcessSkipSkippedIds()
 
         $this->addToAssertionCount(1);
     }
+
+    public function testProcessHandleClosureForCallable()
+    {
+        $closureDefinition = new Definition(\Closure::class);
+        $closureDefinition->setFactory([\Closure::class, 'fromCallable']);
+        $closureDefinition->setArguments(['strlen']);
+
+        $container = new ContainerBuilder();
+        $container
+            ->register('foobar', BarMethodCall::class)
+            ->addMethodCall('setCallable', [$closureDefinition]);
+
+        (new CheckTypeDeclarationsPass(true))->process($container);
+
+        $this->addToAssertionCount(1);
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/BarMethodCall.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/BarMethodCall.php
@@ -36,4 +36,8 @@ public function setArray(array $array)
     public function setIterable(iterable $iterable)
     {
     }
+
+    public function setCallable(callable $callable): void
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar`
`166`	`166`	`return;`
`167`	`167`	`}`
`168`	`168`
`169`		`- if ('callable' === $type && method_exists($class, '__invoke')) {`
	`169`	`+ if ('callable' === $type && (\Closure::class === $class \|\| method_exists($class, '__invoke'))) {`
`170`	`170`	`return;`
`171`	`171`	`}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,8 @@ public function setArray(array $array)`
`36`	`36`	`public function setIterable(iterable $iterable)`
`37`	`37`	`{`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ public function setCallable(callable $callable): void`
	`41`	`+ {`
	`42`	`+ }`
`39`	`43`	`}`