[DI] Fix Xdebug 3.0 detection

vertexvaar · nicolas-grekas · commit 38f8edddb165 · 2020-12-08T15:03:00.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
@@ -23,7 +23,10 @@ public function __construct(string $serviceId, $message = '', int $code = 0, \Th
     {
         $this->serviceId = $serviceId;
 
-        if ($message instanceof \Closure && \function_exists('xdebug_is_enabled') && xdebug_is_enabled()) {
+        if (
+            $message instanceof \Closure
+            && (\function_exists('xdebug_is_enabled') ? xdebug_is_enabled() : \function_exists('xdebug_info'))
+        ) {
             $message = $message();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,10 @@ public function __construct(string $serviceId, $message = '', int $code = 0, \Th`
`23`	`23`	`{`
`24`	`24`	`$this->serviceId = $serviceId;`
`25`	`25`
`26`		`- if ($message instanceof \Closure && \function_exists('xdebug_is_enabled') && xdebug_is_enabled()) {`
	`26`	`+ if (`
	`27`	`+ $message instanceof \Closure`
	`28`	`+ && (\function_exists('xdebug_is_enabled') ? xdebug_is_enabled() : \function_exists('xdebug_info'))`
	`29`	`+ ) {`
`27`	`30`	`$message = $message();`
`28`	`31`	`}`
`29`	`32`