From 66f6e8ef54d6a77e081eb1d3c996a6ab441ff68c Mon Sep 17 00:00:00 2001
From: Amrouche Hamza <hamza@les-tilleuls.coop>
Date: Sat, 6 Apr 2019 16:39:30 +0200
Subject: [PATCH] add tests

---
 .../Compiler/AutowirePass.php                 | 10 +++++++++-
 .../Tests/Compiler/AutowirePassTest.php       | 13 ++++++++++++
 .../Compiler/ResolveBindingsPassTest.php      | 20 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 5aa6680e7e01d..2a1a8ab69be26 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -158,7 +158,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);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index c6c71f7c2617d..487ebf640d411 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -26,6 +26,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';
 
@@ -545,6 +546,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();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
index 43dcb4f8f162b..84b3d6c652fb6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/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();