[DI] fix casting AutowiringFailedException to string when its callback throws

nicolas-grekas · nicolas-grekas · commit d57a148b8b72 · 2019-03-17T16:55:03.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -226,7 +226,16 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                     if ($parameter->isDefaultValueAvailable()) {
                         $value = $parameter->getDefaultValue();
                     } elseif (!$parameter->allowsNull()) {
-                        throw new AutowiringFailedException($this->currentId, $failureMessage);
+                        if (\function_exists('xdebug_disable')) {
+                            xdebug_disable();
+                        }
+                        try {
+                            throw new AutowiringFailedException($this->currentId, $failureMessage);
+                        } finally {
+                            if (\function_exists('xdebug_enable')) {
+                                xdebug_enable();
+                            }
+                        }
                     }
                 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -84,10 +84,15 @@ public function __construct()
             new RemoveUnusedDefinitionsPass(),
             new InlineServiceDefinitionsPass(new AnalyzeServiceReferencesPass()),
             new AnalyzeServiceReferencesPass(),
-            new DefinitionErrorExceptionPass(),
             new CheckExceptionOnInvalidReferenceBehaviorPass(),
             new ResolveHotPathPass(),
         ]];
+
+        $this->afterRemovingPasses = [
+            100 => [
+                new DefinitionErrorExceptionPass(),
+            ],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
@@ -47,7 +47,11 @@ public function __toString(): string
                 $messageCallback = $this->messageCallback;
                 $this->messageCallback = null;
 
-                return $this->message = $messageCallback();
+                try {
+                    return $this->message = $messageCallback();
+                } catch (\Throwable $e) {
+                    return $this->message = $e->getMessage();
+                }
             }
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,11 @@ public function __toString(): string`
`47`	`47`	`$messageCallback = $this->messageCallback;`
`48`	`48`	`$this->messageCallback = null;`
`49`	`49`
`50`		`- return $this->message = $messageCallback();`
	`50`	`+ try {`
	`51`	`+ return $this->message = $messageCallback();`
	`52`	`+ } catch (\Throwable $e) {`
	`53`	`+ return $this->message = $e->getMessage();`
	`54`	`+ }`
`51`	`55`	`}`
`52`	`56`	`};`
`53`	`57`	`}`