Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit 52240c97566e · 2020-12-08T17:43:25.000+01:00
* 4.4: minor cs fix [Config][TwigBundle] Fixed syntax error in config [DI] Fix Xdebug 3.0 detection Use php8 stable [Cache] fix checking for redis_sentinel support [Intl] Update the ICU data to 68.1 Remove unused @throws tags and handling of never thrown exceptions [PhpUnitBridge] Fix disabling DeprecationErrorHandler from phpunit configuration file
diff --git a/Exception/AutowiringFailedException.php b/Exception/AutowiringFailedException.php
@@ -23,7 +23,9 @@ 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,9 @@ 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 ($message instanceof \Closure`
	`27`	`+ && (\function_exists('xdebug_is_enabled') ? xdebug_is_enabled() : \function_exists('xdebug_info'))`
	`28`	`+ ) {`
`27`	`29`	`$message = $message();`
`28`	`30`	`}`
`29`	`31`