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

nicolas-grekas · nicolas-grekas · commit f799b6c9b087 · 2016-04-20T14:07:36.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -107,11 +107,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();
@@ -242,12 +242,16 @@ private function getReflectionClass($id, Definition $definition)
         }
 
         $class = $this->container->getParameterBag()->resolveValue($class);
+        $throwingAutoloader = function () { throw new \ReflectionException(); };
+        $reflector = false;
 
         try {
+            spl_autoload_register($throwingAutoloader);
             $reflector = new \ReflectionClass($class);
-        } catch (\ReflectionException $reflectionException) {
-            $reflector = false;
+        } catch (\Error $e) {
+        } catch (\Exception $e) {
         }
+        spl_autoload_unregister($throwingAutoloader);
 
         return $this->reflectionClasses[$id] = $reflector;
     }

Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ private function completeDefinition($id, Definition $definition)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`}`
`110`		`- } catch (\ReflectionException $reflectionException) {`
	`110`	`+ } catch (\ReflectionException $e) {`
`111`	`111`	`// Typehint against a non-existing class`
`112`	`112`
`113`	`113`	`if (!$parameter->isDefaultValueAvailable()) {`
`114`		`- 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);`
	`114`	`+ 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);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`$value = $parameter->getDefaultValue();`
`@@ -242,12 +242,16 @@ private function getReflectionClass($id, Definition $definition)`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`$class = $this->container->getParameterBag()->resolveValue($class);`
	`245`	`+ $throwingAutoloader = function () { throw new \ReflectionException(); };`
	`246`	`+ $reflector = false;`
`245`	`247`
`246`	`248`	`try {`
	`249`	`+ spl_autoload_register($throwingAutoloader);`
`247`	`250`	`$reflector = new \ReflectionClass($class);`
`248`		`- } catch (\ReflectionException $reflectionException) {`
`249`		`- $reflector = false;`
	`251`	`+ } catch (\Error $e) {`
	`252`	`+ } catch (\Exception $e) {`
`250`	`253`	`}`
	`254`	`+ spl_autoload_unregister($throwingAutoloader);`
`251`	`255`
`252`	`256`	`return $this->reflectionClasses[$id] = $reflector;`
`253`	`257`	`}`