Skip to content

Commit 7a72213

Browse files
Merge branch '5.1' into 5.2
* 5.1: minor cs fix [Config][TwigBundle] Fixed syntax error in config [DI] Fix Xdebug 3.0 detection Use php8 stable [Notifier] Streamline changelogs of notifier bridges [Cache] fix checking for redis_sentinel support [Messenger] Fixed wording in php doc [Intl] Update the ICU data to 68.1 [FrameworkBundle] acces public-deprecated services via the private container to remove false-positive deprecations Remove unused @throws tags and handling of never thrown exceptions [PhpUnitBridge] Fix disabling DeprecationErrorHandler from phpunit configuration file
2 parents 32d06df + 52240c9 commit 7a72213

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Exception/AutowiringFailedException.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ public function __construct(string $serviceId, $message = '', int $code = 0, \Th
2323
{
2424
$this->serviceId = $serviceId;
2525

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+
) {
2729
$message = $message();
2830
}
2931

0 commit comments

Comments
 (0)