[DependencyInjection][CheckTypeDeclarationsPass] Handle \Closure for callable

Author: fancyweb

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;
             }
 

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);
+    }
 }

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
+    {
+    }
 }