Skip to content

Commit 295a294

Browse files
Merge branch '6.3' into 6.4
* 6.3: [Cache] Fix tests [Mailer] [MailPace] Fix undefined array key in errors response [DependencyInjection] Allow casting env var processors to cast null [VarDumper] Add named arguments coverage of VarDumper's function [SecurityBundle] Use LogicException instead of Definition::addError() [PhpUnitBridge] Disable deduplication of Doctrine deprecations [Cache] Fix DBAL deprecations [Messenger] Add deprecation message for the "messenger.listener.stop_worker_on_sigterm_signal_listener" service Fix broken symlink tests Windows PHP 7.4+ [SecurityBundle] Fix error message when using OIDC and web-token/jwt-core is not installed [Serializer] Fix discriminator map not working with `AbstractNormalizer::OBJECT_TO_POPULATE` add @throws to getPayload [FrameworkBundle] ease migration to symfony 6.3 [VarDumper] Use documentElement instead of body for JS flag Bump Symfony version to 6.3.1 Update VERSION for 6.3.0 Update CHANGELOG for 6.3.0 [Serializer] Fix discriminator map not working with `AbstractNormalizer::OBJECT_TO_POPULATE`
2 parents 38191d6 + 7e8f332 commit 295a294

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

FrameworkBundle.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,13 @@ public function boot()
9898
$_ENV['DOCTRINE_DEPRECATIONS'] = $_SERVER['DOCTRINE_DEPRECATIONS'] ??= 'trigger';
9999

100100
$handler = ErrorHandler::register(null, false);
101-
$this->container->get('debug.error_handler_configurator')->configure($handler);
101+
102+
// When upgrading an existing Symfony application from 6.2 to 6.3, and
103+
// the cache is warmed up, the service is not available yet, so we need
104+
// to check if it exists.
105+
if ($this->container->has('debug.error_handler_configurator')) {
106+
$this->container->get('debug.error_handler_configurator')->configure($handler);
107+
}
102108

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

Resources/config/messenger.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,9 @@
209209
->tag('kernel.event_subscriber')
210210
->tag('monolog.logger', ['channel' => 'messenger'])
211211

212+
->alias('messenger.listener.stop_worker_on_sigterm_signal_listener', 'messenger.listener.stop_worker_signals_listener')
213+
->deprecate('6.3', 'symfony/messenger', 'The "%alias_id%" service is deprecated, use "messenger.listener.stop_worker_signals_listener" instead.')
214+
212215
->set('messenger.listener.stop_worker_on_stop_exception_listener', StopWorkerOnCustomStopExceptionListener::class)
213216
->tag('kernel.event_subscriber')
214217

0 commit comments

Comments
 (0)