Skip to content

Commit 271cda0

Browse files
Merge branch '6.4' into 7.1
* 6.4: Tweak error/exception handler registration
2 parents 8a792de + c695435 commit 271cda0

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

FrameworkBundle.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
use Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass;
5858
use Symfony\Component\Routing\DependencyInjection\AddExpressionLanguageProvidersPass;
5959
use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass;
60+
use Symfony\Component\Runtime\SymfonyRuntime;
6061
use Symfony\Component\Scheduler\DependencyInjection\AddScheduleMessengerPass;
6162
use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
6263
use Symfony\Component\Translation\DependencyInjection\DataCollectorTranslatorPass;
@@ -95,9 +96,16 @@ public function boot(): void
9596
{
9697
$_ENV['DOCTRINE_DEPRECATIONS'] = $_SERVER['DOCTRINE_DEPRECATIONS'] ??= 'trigger';
9798

98-
$handler = ErrorHandler::register(null, false);
99+
if (class_exists(SymfonyRuntime::class)) {
100+
$handler = set_error_handler('var_dump');
101+
restore_error_handler();
102+
} else {
103+
$handler = [ErrorHandler::register(null, false)];
104+
}
99105

100-
$this->container->get('debug.error_handler_configurator')->configure($handler);
106+
if (\is_array($handler) && $handler[0] instanceof ErrorHandler) {
107+
$this->container->get('debug.error_handler_configurator')->configure($handler[0]);
108+
}
101109

102110
if ($this->container->getParameter('kernel.http_method_override')) {
103111
Request::enableHttpMethodParameterOverride();

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
"symfony/mime": "<6.4",
9393
"symfony/property-info": "<6.4",
9494
"symfony/property-access": "<6.4",
95+
"symfony/runtime": "<6.4.13|>=7.0,<7.1.6",
9596
"symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
9697
"symfony/serializer": "<6.4",
9798
"symfony/security-csrf": "<6.4",

0 commit comments

Comments
 (0)