Merge branch '3.4' into 4.2

* 3.4:
  [WIP] [DependencyInjection] Fix a wrong error when using a factory and a call

Author: fabpot

Compiler/AutowirePass.php

@@ -159,7 +159,15 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot):
             if ($method instanceof \ReflectionFunctionAbstract) {
                 $reflectionMethod = $method;
             } else {
-                $reflectionMethod = $this->getReflectionMethod(new Definition($reflectionClass->name), $method);
+                $definition = new Definition($reflectionClass->name);
+                try {
+                    $reflectionMethod = $this->getReflectionMethod($definition, $method);
+                } catch (RuntimeException $e) {
+                    if ($definition->getFactory()) {
+                        continue;
+                    }
+                    throw $e;
+                }
             }
 
             $arguments = $this->autowireMethod($reflectionMethod, $arguments);

Compiler/ResolveBindingsPass.php

@@ -115,7 +115,14 @@ protected function processValue($value, $isRoot = false)
             if ($method instanceof \ReflectionFunctionAbstract) {
                 $reflectionMethod = $method;
             } else {
-                $reflectionMethod = $this->getReflectionMethod($value, $method);
+                try {
+                    $reflectionMethod = $this->getReflectionMethod($value, $method);
+                } catch (RuntimeException $e) {
+                    if ($value->getFactory()) {
+                        continue;
+                    }
+                    throw $e;
+                }
             }
 
             foreach ($reflectionMethod->getParameters() as $key => $parameter) {

Tests/Compiler/AutowirePassTest.php

@@ -27,6 +27,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
 use Symfony\Component\DependencyInjection\TypedReference;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
 
@@ -546,6 +547,18 @@ public function testSetterInjection()
         );
     }
 
+    public function testWithNonExistingSetterAndAutowiring()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(HttpKernelInterface::class, HttpKernelInterface::class)->setAutowired(true);
+        $definition->addMethodCall('setLogger');
+        $this->expectException(RuntimeException::class);
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new AutowirePass())->process($container);
+    }
+
     public function testExplicitMethodInjection()
     {
         $container = new ContainerBuilder();

Tests/Compiler/ResolveBindingsPassTest.php

@@ -16,11 +16,14 @@
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists;
 use Symfony\Component\DependencyInjection\TypedReference;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
 
@@ -112,6 +115,23 @@ public function testScalarSetter()
         $this->assertEquals([['setDefaultLocale', ['fr']]], $definition->getMethodCalls());
     }
 
+    public function testWithNonExistingSetterAndBinding()
+    {
+        $container = new ContainerBuilder();
+
+        $bindings = [
+            '$c' => (new Definition('logger'))->setFactory('logger'),
+        ];
+
+        $definition = $container->register(HttpKernelInterface::class, HttpKernelInterface::class);
+        $definition->addMethodCall('setLogger');
+        $definition->setBindings($bindings);
+        $this->expectException(RuntimeException::class);
+
+        $pass = new ResolveBindingsPass();
+        $pass->process($container);
+    }
+
     public function testTupleBinding()
     {
         $container = new ContainerBuilder();