[DI] Fix AutowirePass fatal error with classes that have non-existing parents

nicolas-grekas · nicolas-grekas · commit 202cc7724e13 · 2016-04-20T16:12:37.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -34,19 +34,32 @@ class AutowirePass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        $this->container = $container;
-        foreach ($container->getDefinitions() as $id => $definition) {
-            if ($definition->isAutowired()) {
-                $this->completeDefinition($id, $definition);
+        $throwingAutoloader = function ($class) { throw new \ReflectionException(sprintf('Class %s does not exist', $class)); };
+        spl_autoload_register($throwingAutoloader);
+
+        try {
+            $this->container = $container;
+            foreach ($container->getDefinitions() as $id => $definition) {
+                if ($definition->isAutowired()) {
+                    $this->completeDefinition($id, $definition);
+                }
             }
+        } catch (\Error $e) {
+        } catch (\Exception $e) {
         }
 
+        spl_autoload_unregister($throwingAutoloader);
+
         // Free memory and remove circular reference to container
         $this->container = null;
         $this->reflectionClasses = array();
         $this->definedTypes = array();
         $this->types = null;
         $this->notGuessableTypes = array();
+
+        if (isset($e)) {
+            throw $e;
+        }
     }
 
     /**
@@ -107,11 +120,11 @@ private function completeDefinition($id, Definition $definition)
                         }
                     }
                 }
-            } catch (\ReflectionException $reflectionException) {
+            } catch (\ReflectionException $e) {
                 // Typehint against a non-existing class
 
                 if (!$parameter->isDefaultValueAvailable()) {
-                    throw new RuntimeException(sprintf('Cannot autowire argument %s for %s because the type-hinted class does not exist (%s).', $index + 1, $definition->getClass(), $reflectionException->getMessage()), 0, $reflectionException);
+                    throw new RuntimeException(sprintf('Cannot autowire argument %s for %s because the type-hinted class does not exist (%s).', $index + 1, $definition->getClass(), $e->getMessage()), 0, $e);
                 }
 
                 $value = $parameter->getDefaultValue();
@@ -245,7 +258,7 @@ private function getReflectionClass($id, Definition $definition)
 
         try {
             $reflector = new \ReflectionClass($class);
-        } catch (\ReflectionException $reflectionException) {
+        } catch (\ReflectionException $e) {
             $reflector = false;
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -268,6 +268,21 @@ public function testClassNotFoundThrowsException()
         $pass->process($container);
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage Cannot autowire argument 2 for Symfony\Component\DependencyInjection\Tests\Compiler\BadParentTypeHintedArgument because the type-hinted class does not exist (Class Symfony\Component\DependencyInjection\Tests\Compiler\OptionalServiceClass does not exist).
+     */
+    public function testParentClassNotFoundThrowsException()
+    {
+        $container = new ContainerBuilder();
+
+        $aDefinition = $container->register('a', __NAMESPACE__.'\BadParentTypeHintedArgument');
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
     public function testDontUseAbstractServices()
     {
         $container = new ContainerBuilder();
@@ -524,6 +539,12 @@ public function __construct(Dunglas $k, NotARealClass $r)
     {
     }
 }
+class BadParentTypeHintedArgument
+{
+    public function __construct(Dunglas $k, OptionalServiceClass $r)
+    {
+    }
+}
 class NotGuessableArgument
 {
     public function __construct(Foo $k)

Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,21 @@ public function testClassNotFoundThrowsException()`
`268`	`268`	`$pass->process($container);`
`269`	`269`	`}`
`270`	`270`
	`271`	`+ /**`
	`272`	`+ * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException`
	`273`	`+ * @expectedExceptionMessage Cannot autowire argument 2 for Symfony\Component\DependencyInjection\Tests\Compiler\BadParentTypeHintedArgument because the type-hinted class does not exist (Class Symfony\Component\DependencyInjection\Tests\Compiler\OptionalServiceClass does not exist).`
	`274`	`+ */`
	`275`	`+ public function testParentClassNotFoundThrowsException()`
	`276`	`+ {`
	`277`	`+ $container = new ContainerBuilder();`
	`278`	`+`
	`279`	`+ $aDefinition = $container->register('a', __NAMESPACE__.'\BadParentTypeHintedArgument');`
	`280`	`+ $aDefinition->setAutowired(true);`
	`281`	`+`
	`282`	`+ $pass = new AutowirePass();`
	`283`	`+ $pass->process($container);`
	`284`	`+ }`
	`285`	`+`
`271`	`286`	`public function testDontUseAbstractServices()`
`272`	`287`	`{`
`273`	`288`	`$container = new ContainerBuilder();`
`@@ -524,6 +539,12 @@ public function __construct(Dunglas $k, NotARealClass $r)`
`524`	`539`	`{`
`525`	`540`	`}`
`526`	`541`	`}`
	`542`	`+class BadParentTypeHintedArgument`
	`543`	`+{`
	`544`	`+ public function __construct(Dunglas $k, OptionalServiceClass $r)`
	`545`	`+ {`
	`546`	`+ }`
	`547`	`+}`
`527`	`548`	`class NotGuessableArgument`
`528`	`549`	`{`
`529`	`550`	`public function __construct(Foo $k)`