symfony · nicolas-grekas · Jul 4, 2023 · Jul 4, 2023
diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md
@@ -1,6 +1,11 @@
 UPGRADE FROM 6.3 to 6.4
 =======================
 
+Cache
+-----
+
+ * `EarlyExpirationHandler` no longer implements `MessageHandlerInterface`, rely on `AsMessageHandler` instead
+
 DependencyInjection
 -------------------
 

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php
@@ -277,5 +277,7 @@ public function testWithoutStopwatch(callable $sqlMethod, callable $endTransacti
         $this->conn->beginTransaction();
         $sqlMethod($this->conn, 'SELECT * FROM products');
         $endTransactionMethod($this->conn);
+
+        $this->addToAssertionCount(1);
     }
 }
@@ -128,7 +128,7 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.extension.expression')->addTag('twig.extension');
         }
 
-        if (!class_exists(Workflow::class) || !$container->has('workflow.registry')) {
+        if (!class_exists(Workflow::class) || !$container->has('.workflow.registry')) {
             $container->removeDefinition('workflow.twig_extension');
         } else {
             $container->getDefinition('workflow.twig_extension')->addTag('twig.extension');

diff --git a/src/Symfony/Component/Cache/CHANGELOG.md b/src/Symfony/Component/Cache/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.4
+---
+
+ * `EarlyExpirationHandler` no longer implements `MessageHandlerInterface`, rely on `AsMessageHandler` instead
+
 6.3
 ---
 

diff --git a/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php b/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php
@@ -13,12 +13,13 @@
 
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\DependencyInjection\ReverseContainer;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
 /**
  * Computes cached values sent to a message bus.
  */
-class EarlyExpirationHandler implements MessageHandlerInterface
+#[AsMessageHandler]
+class EarlyExpirationHandler
 {
     private ReverseContainer $reverseContainer;
     private array $processedNonces = [];

diff --git a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
@@ -175,6 +175,9 @@ public function testEventSubscriber()
         $this->assertTrue($res->isFresh(0));
     }
 
+    /**
+     * @group legacy
+     */
     public function testMessageSubscriber()
     {
         $res = new ReflectionClassResource(new \ReflectionClass(TestMessageSubscriber::class));
@@ -229,18 +232,20 @@ public static function getSubscribedEvents(): array
     }
 }
 
-class TestMessageSubscriber implements MessageSubscriberInterface
-{
-    public static function getHandledMessages(): iterable
+if (interface_exists(MessageSubscriberInterface::class)) {
+    class TestMessageSubscriber implements MessageSubscriberInterface
     {
-        foreach (TestMessageSubscriberConfigHolder::$handledMessages as $key => $subscribedMessage) {
-            yield $key => $subscribedMessage;
+        public static function getHandledMessages(): iterable
+        {
+            foreach (TestMessageSubscriberConfigHolder::$handledMessages as $key => $subscribedMessage) {
+                yield $key => $subscribedMessage;
+            }
         }
     }
-}
-class TestMessageSubscriberConfigHolder
-{
-    public static $handledMessages = [];
+    class TestMessageSubscriberConfigHolder
+    {
+        public static $handledMessages = [];
+    }
 }
 
 class TestServiceSubscriber implements ServiceSubscriberInterface

diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Messenger\Bridge\Amqp\Transport\Connection;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\EventListener\DispatchPcntlSignalListener;
-use Symfony\Component\Messenger\EventListener\StopWorkerOnSigtermSignalListener;
+use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Worker;
@@ -33,7 +33,7 @@
 $connection = Connection::fromDsn(getenv('DSN'));
 $receiver = new AmqpReceiver($connection, $serializer);
 $eventDispatcher = new EventDispatcher();
-$eventDispatcher->addSubscriber(new StopWorkerOnSigtermSignalListener());
+$eventDispatcher->addSubscriber(new StopWorkerOnSignalsListener());
 $eventDispatcher->addSubscriber(new DispatchPcntlSignalListener());
 
 $worker = new Worker(['the_receiver' => $receiver], new class() implements MessageBusInterface {