Merge branch '4.4'

* 4.4:
  [Messenger] use events consistently in worker
  Deprecate things that prevent \Throwable from bubbling down

Author: nicolas-grekas

CHANGELOG.md

@@ -40,6 +40,7 @@ CHANGELOG
  * [BC Break] The `framework.messenger.routing.senders` config key is not deep merged anymore.
  * Added `secrets:*` commands and `%env(secret:...)%` processor to deal with secrets seamlessly.
  * Made `framework.session.handler_id` accept a DSN
+ * Marked the `RouterDataCollector` class as `@final`.
 
 4.3.0
 -----

Console/Application.php

@@ -207,11 +207,15 @@ private function renderRegistrationErrors(InputInterface $input, OutputInterface
         (new SymfonyStyle($input, $output))->warning('Some commands could not be registered:');
 
         foreach ($this->registrationErrors as $error) {
-            if (!$error instanceof \Exception) {
-                $error = new ErrorException($error);
-            }
+            if (method_exists($this, 'doRenderThrowable')) {
+                $this->doRenderThrowable($error, $output);
+            } else {
+                if (!$error instanceof \Exception) {
+                    $error = new ErrorException($error);
+                }
 
-            $this->doRenderException($error, $output);
+                $this->doRenderException($error, $output);
+            }
         }
     }
 }

DataCollector/RouterDataCollector.php

@@ -19,6 +19,8 @@
  * RouterDataCollector.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final since Symfony 4.4
  */
 class RouterDataCollector extends BaseRouterDataCollector
 {

Resources/config/console.xml

@@ -88,12 +88,9 @@
         <service id="console.command.messenger_consume_messages" class="Symfony\Component\Messenger\Command\ConsumeMessagesCommand">
             <argument /> <!-- Routable message bus -->
             <argument type="service" id="messenger.receiver_locator" />
+            <argument type="service" id="event_dispatcher" />
             <argument type="service" id="logger" on-invalid="null" />
             <argument type="collection" /> <!-- Receiver names -->
-            <argument type="service" id="event_dispatcher" />
-            <call method="setCachePoolForRestartSignal">
-                <argument type="service" id="cache.messenger.restart_workers_signal" />
-            </call>
 
             <tag name="console.command" command="messenger:consume" />
             <tag name="monolog.logger" channel="messenger" />

Resources/config/messenger.xml

@@ -98,6 +98,7 @@
             <argument /> <!-- max delay ms -->
         </service>
 
+        <!-- worker event listeners -->
         <service id="messenger.retry.send_failed_message_for_retry_listener" class="Symfony\Component\Messenger\EventListener\SendFailedMessageForRetryListener">
             <tag name="kernel.event_subscriber" />
             <tag name="monolog.logger" channel="messenger" />
@@ -106,14 +107,28 @@
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
-        <!-- failed handling -->
         <service id="messenger.failure.send_failed_message_to_failure_transport_listener" class="Symfony\Component\Messenger\EventListener\SendFailedMessageToFailureTransportListener">
             <tag name="kernel.event_subscriber" />
             <tag name="monolog.logger" channel="messenger" />
             <argument /> <!-- Failure transport -->
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
+        <service id="messenger.listener.dispatch_pcntl_signal_listener" class="Symfony\Component\Messenger\EventListener\DispatchPcntlSignalListener">
+            <tag name="kernel.event_subscriber" />
+        </service>
+
+        <service id="messenger.listener.stop_worker_on_restart_signal_listener" class="Symfony\Component\Messenger\EventListener\StopWorkerOnRestartSignalListener">
+            <tag name="kernel.event_subscriber" />
+            <tag name="monolog.logger" channel="messenger" />
+            <argument type="service" id="cache.messenger.restart_workers_signal" />
+            <argument type="service" id="logger" on-invalid="ignore" />
+        </service>
+
+        <service id="messenger.listener.stop_worker_on_sigterm_signal_listener" class="Symfony\Component\Messenger\EventListener\StopWorkerOnSigtermSignalListener">
+            <tag name="kernel.event_subscriber" />
+        </service>
+
         <!-- routable message bus -->
         <service id="messenger.routable_message_bus" class="Symfony\Component\Messenger\RoutableMessageBus">
             <argument /> <!-- Message bus locator -->