symfony
diff --git a/‎src/Symfony/Component/Messenger/Event/WorkerStoppedEvent.php
Lines changed: 1 addition & 8 deletions b/‎src/Symfony/Component/Messenger/Event/WorkerStoppedEvent.php
Lines changed: 1 addition & 8 deletions
diff --git a/‎src/Symfony/Component/Messenger/EventListener/ResetConnectionOnWorkerStopListener.php
Lines changed: 0 additions & 35 deletions b/‎src/Symfony/Component/Messenger/EventListener/ResetConnectionOnWorkerStopListener.php
Lines changed: 0 additions & 35 deletions
diff --git a/‎src/Symfony/Component/Messenger/Tests/EventListener/ResetConnectionOnWorkerStopListenerTest.php
Lines changed: 0 additions & 34 deletions b/‎src/Symfony/Component/Messenger/Tests/EventListener/ResetConnectionOnWorkerStopListenerTest.php
Lines changed: 0 additions & 34 deletions
diff --git a/‎src/Symfony/Component/Messenger/Tests/WorkerTest.php
Lines changed: 13 additions & 0 deletions b/‎src/Symfony/Component/Messenger/Tests/WorkerTest.php
Lines changed: 13 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Messenger/Worker.php
Lines changed: 12 additions & 1 deletion b/‎src/Symfony/Component/Messenger/Worker.php
Lines changed: 12 additions & 1 deletion
@@ -21,21 +21,14 @@
 final class WorkerStoppedEvent
 {
     private $worker;
-    private $receivers;
 
-    public function __construct(Worker $worker, array $receivers)
+    public function __construct(Worker $worker)
     {
-        $this->receivers = $receivers;
         $this->worker = $worker;
     }
 
     public function getWorker(): Worker
     {
         return $this->worker;
     }
-
-    public function getReceivers()
-    {
-        return $this->receivers;
-    }
 }
@@ -29,6 +29,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
@@ -86,6 +87,18 @@ public function testHandlingErrorCausesReject()
     }
 
     public function testWorkerDoesNotSendNullMessagesToTheBus()
+    {
+        $resettableReceiver = $this->createMock(ResetInterface::class);
+        $resettableReceiver->expects($this->once())->method('reset');
+
+        $bus = $this->createMock(MessageBusInterface::class);
+        $dispatcher = new EventDispatcher();
+
+        $worker = new Worker([$resettableReceiver], $bus, $dispatcher);
+        $worker->run();
+    }
+
+    public function testWorkerResetsConnectionIfReceiverIsResettable()
     {
         $receiver = new DummyReceiver([
             null,
 
@@ -25,6 +25,7 @@
 use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @author Samuel Roze <[email protected]>
@@ -101,7 +102,8 @@ public function run(array $options = []): void
             }
         }
 
-        $this->dispatchEvent(new WorkerStoppedEvent($this, $this->receivers));
+        $this->dispatchEvent(new WorkerStoppedEvent($this));
+        $this->resetReceiverConnections();
     }
 
     private function handleMessage(Envelope $envelope, ReceiverInterface $receiver, string $transportName): void
@@ -155,6 +157,15 @@ public function stop(): void
         $this->shouldStop = true;
     }
 
+    private function resetReceiverConnections(): void
+    {
+        foreach ($this->receivers as $transportName => $receiver) {
+            if ($receiver instanceof ResetInterface) {
+                $receiver->reset();
+            }
+        }
+    }
+
     private function dispatchEvent($event)
     {
         if (null === $this->eventDispatcher) {
Original file line number	Diff line number	Diff line change
`@@ -21,21 +21,14 @@`
`21`	`21`	`final class WorkerStoppedEvent`
`22`	`22`	`{`
`23`	`23`	`private $worker;`
`24`		`- private $receivers;`
`25`	`24`
`26`		`- public function __construct(Worker $worker, array $receivers)`
	`25`	`+ public function __construct(Worker $worker)`
`27`	`26`	`{`
`28`		`- $this->receivers = $receivers;`
`29`	`27`	`$this->worker = $worker;`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`public function getWorker(): Worker`
`33`	`31`	`{`
`34`	`32`	`return $this->worker;`
`35`	`33`	`}`
`36`		`-`
`37`		`- public function getReceivers()`
`38`		`- {`
`39`		`- return $this->receivers;`
`40`		`- }`
`41`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`use Symfony\Component\Messenger\Stamp\ReceivedStamp;`
`26`	`26`	`use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;`
`27`	`27`	`use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;`
	`28`	`+use Symfony\Contracts\Service\ResetInterface;`
`28`	`29`
`29`	`30`	`/**`
`30`	`31`	`* @author Samuel Roze <[email protected]>`
`@@ -101,7 +102,8 @@ public function run(array $options = []): void`
`101`	`102`	`}`
`102`	`103`	`}`
`103`	`104`
`104`		`- $this->dispatchEvent(new WorkerStoppedEvent($this, $this->receivers));`
	`105`	`+ $this->dispatchEvent(new WorkerStoppedEvent($this));`
	`106`	`+ $this->resetReceiverConnections();`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`private function handleMessage(Envelope $envelope, ReceiverInterface $receiver, string $transportName): void`
`@@ -155,6 +157,15 @@ public function stop(): void`
`155`	`157`	`$this->shouldStop = true;`
`156`	`158`	`}`
`157`	`159`
	`160`	`+ private function resetReceiverConnections(): void`
	`161`	`+ {`
	`162`	`+ foreach ($this->receivers as $transportName => $receiver) {`
	`163`	`+ if ($receiver instanceof ResetInterface) {`
	`164`	`+ $receiver->reset();`
	`165`	`+ }`
	`166`	`+ }`
	`167`	`+ }`
	`168`	`+`
`158`	`169`	`private function dispatchEvent($event)`
`159`	`170`	`{`
`160`	`171`	`if (null === $this->eventDispatcher) {`