Merge branch '5.4' into 6.0

* 5.4:
  [PhpUnitBridge] Fix test
  [RateLimiter] Add typecase to SlidingWindow::getExpirationTime
  Bump Symfony version to 5.4.8
  Update VERSION for 5.4.7
  Update CHANGELOG for 5.4.7
  Bump Symfony version to 4.4.41
  Update VERSION for 4.4.40
  Update CONTRIBUTORS for 4.4.40
  Update CHANGELOG for 4.4.40
  [Messenger] reset connection on worker shutdown
  reset Twig form theme resources between requests

Author: nicolas-grekas

Tests/WorkerTest.php

@@ -40,6 +40,7 @@
 use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 use Symfony\Component\Messenger\Worker;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @group time-sensitive
@@ -98,6 +99,19 @@ public function testHandlingErrorCausesReject()
         $this->assertSame(0, $receiver->getAcknowledgeCount());
     }
 
+    public function testWorkerResetsConnectionIfReceiverIsResettable()
+    {
+        $resettableReceiver = new ResettableDummyReceiver([]);
+
+        $bus = $this->createMock(MessageBusInterface::class);
+        $dispatcher = new EventDispatcher();
+
+        $worker = new Worker([$resettableReceiver], $bus, $dispatcher);
+        $worker->stop();
+        $worker->run();
+        $this->assertTrue($resettableReceiver->hasBeenReset());
+    }
+
     public function testWorkerDoesNotSendNullMessagesToTheBus()
     {
         $receiver = new DummyReceiver([
@@ -538,3 +552,18 @@ private function process(array $jobs): void
         }
     }
 }
+
+class ResettableDummyReceiver extends DummyReceiver implements ResetInterface
+{
+    private $hasBeenReset = false;
+
+    public function reset()
+    {
+        $this->hasBeenReset = true;
+    }
+
+    public function hasBeenReset(): bool
+    {
+        return $this->hasBeenReset;
+    }
+}

Worker.php

@@ -29,6 +29,7 @@
 use Symfony\Component\Messenger\Transport\Receiver\QueueReceiverInterface;
 use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
@@ -133,6 +134,7 @@ public function run(array $options = []): void
 
         $this->flush(true);
         $this->dispatchEvent(new WorkerStoppedEvent($this));
+        $this->resetReceiverConnections();
     }
 
     private function handleMessage(Envelope $envelope, string $transportName): void
@@ -256,6 +258,15 @@ public function getMetadata(): WorkerMetadata
         return $this->metadata;
     }
 
+    private function resetReceiverConnections(): void
+    {
+        foreach ($this->receivers as $receiver) {
+            if ($receiver instanceof ResetInterface) {
+                $receiver->reset();
+            }
+        }
+    }
+
     private function dispatchEvent(object $event): void
     {
         if (null === $this->eventDispatcher) {