[DI] Skip unknown method calls for factories in check types pass

fancyweb · nicolas-grekas · commit 592bff88f250 · 2019-11-28T13:12:16.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
@@ -49,6 +49,6 @@ public function process(ContainerBuilder $container)
             }
         });
 
-        $container->addCompilerPass(new CheckTypeDeclarationsPass(true, ['http_client', '.debug.http_client']), PassConfig::TYPE_AFTER_REMOVING, -100);
+        $container->addCompilerPass(new CheckTypeDeclarationsPass(true), PassConfig::TYPE_AFTER_REMOVING, -100);
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "symfony/cache": "^4.4|^5.0",
         "symfony/config": "^4.3.4|^5.0",
-        "symfony/dependency-injection": "^4.4|^5.0",
+        "symfony/dependency-injection": "^4.4.1|^5.0.1",
         "symfony/http-foundation": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4",
         "symfony/polyfill-mbstring": "~1.0",
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\InvalidParameterTypeException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
@@ -37,24 +38,22 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
     private const SCALAR_TYPES = ['int', 'float', 'bool', 'string'];
 
     private $autoload;
-    private $ignoredServices;
 
     /**
      * @param bool $autoload Whether services who's class in not loaded should be checked or not.
      *                       Defaults to false to save loading code during compilation.
      */
-    public function __construct(bool $autoload = false, array $ignoredServices = [])
+    public function __construct(bool $autoload = false)
     {
         $this->autoload = $autoload;
-        $this->ignoredServices = array_flip($ignoredServices);
     }
 
     /**
      * {@inheritdoc}
      */
     protected function processValue($value, $isRoot = false)
     {
-        if (!$value instanceof Definition || isset($this->ignoredServices[$this->currentId])) {
+        if (!$value instanceof Definition || $value->hasErrors()) {
             return parent::processValue($value, $isRoot);
         }
 
@@ -71,7 +70,15 @@ protected function processValue($value, $isRoot = false)
         }
 
         foreach ($value->getMethodCalls() as $methodCall) {
-            $reflectionMethod = $this->getReflectionMethod($value, $methodCall[0]);
+            try {
+                $reflectionMethod = $this->getReflectionMethod($value, $methodCall[0]);
+            } catch (RuntimeException $e) {
+                if ($value->getFactory()) {
+                    continue;
+                }
+
+                throw $e;
+            }
 
             $this->checkTypeDeclarations($value, $reflectionMethod, $methodCall[1]);
         }

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@ public function process(ContainerBuilder $container)`
`49`	`49`	`}`
`50`	`50`	`});`
`51`	`51`
`52`		`- $container->addCompilerPass(new CheckTypeDeclarationsPass(true, ['http_client', '.debug.http_client']), PassConfig::TYPE_AFTER_REMOVING, -100);`
	`52`	`+ $container->addCompilerPass(new CheckTypeDeclarationsPass(true), PassConfig::TYPE_AFTER_REMOVING, -100);`
`53`	`53`	`}`
`54`	`54`	`}`