Move back to using receive(): iterator based on the feedback

Author: sroze

src/Symfony/Component/Message/Asynchronous/Transport/WrapIntoReceivedMessage.php

@@ -25,15 +25,19 @@ public function __construct(ReceiverInterface $decoratedConsumer)
         $this->decoratedReceiver = $decoratedConsumer;
     }
 
-    public function receive(): \Generator
+    public function receive(): iterable
     {
-        $generator = $this->decoratedReceiver->receive();
+        $iterator = $this->decoratedReceiver->receive();
 
-        foreach ($generator as $message) {
+        foreach ($iterator as $message) {
             try {
                 yield new ReceivedMessage($message);
             } catch (\Throwable $e) {
-                $generator->throw($e);
+                if (!$iterator instanceof \Generator) {
+                    throw $e;
+                }
+
+                $iterator->throw($e);
             }
         }
     }

src/Symfony/Component/Message/Transport/Enhancers/MaximumCountReceiver.php

@@ -24,16 +24,20 @@ public function __construct(ReceiverInterface $decoratedReceiver, int $maximumNu
         $this->maximumNumberOfMessages = $maximumNumberOfMessages;
     }
 
-    public function receive(): \Generator
+    public function receive(): iterable
     {
-        $generator = $this->decoratedReceiver->receive();
+        $iterator = $this->decoratedReceiver->receive();
         $receivedMessages = 0;
 
-        foreach ($generator as $message) {
+        foreach ($iterator as $message) {
             try {
                 yield $message;
             } catch (\Throwable $e) {
-                $generator->throw($e);
+                if (!$iterator instanceof \Generator) {
+                    throw $e;
+                }
+
+                $iterator->throw($e);
             }
 
             if (++$receivedMessages > $this->maximumNumberOfMessages) {

src/Symfony/Component/Message/Transport/ReceiverInterface.php

@@ -16,5 +16,5 @@
  */
 interface ReceiverInterface
 {
-    public function receive(): \Generator;
+    public function receive(): iterable;
 }

src/Symfony/Component/Message/Worker.php

@@ -33,18 +33,21 @@ public function __construct(ReceiverInterface $receiver, MessageBusInterface $bu
      */
     public function run()
     {
-        $messageGenerator = $this->receiver->receive();
+        $iterator = $this->receiver->receive();
 
-        foreach ($messageGenerator as $message) {
+        foreach ($iterator as $message) {
             if (!$message instanceof ReceivedMessage) {
                 $message = new ReceivedMessage($message);
             }
 
             try {
                 $this->bus->dispatch($message);
             } catch (\Throwable $e) {
-                // Return the exception to the message generator so it can properly handle it if needed.
-                $messageGenerator->throw($e);
+                if (!$iterator instanceof \Generator) {
+                    throw $e;
+                }
+
+                $iterator->throw($e);
             }
         }
     }