[Messenger] Fix collecting messages

Author: ro0NL

src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php

@@ -117,13 +117,15 @@ public function getExceptionsCount(string $bus = null): int
         return $count;
     }
 
-    public function getMessages(string $bus = null): iterable
+    public function getMessages(string $bus = null): array
     {
-        foreach ($this->data['messages'] ?? array() as $message) {
-            if (null === $bus || $bus === $message['bus']) {
-                yield $message;
-            }
+        if (null === $bus) {
+            return $this->data['messages'];
         }
+
+        return array_filter($this->data['messages'], function ($message) use ($bus) {
+            return $bus === $message['bus'];
+        });
     }
 
     public function getBuses(): array

src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php

@@ -50,7 +50,7 @@ public function testHandle()
 
         $collector->lateCollect();
 
-        $messages = iterator_to_array($collector->getMessages());
+        $messages = $collector->getMessages();
         $this->assertCount(1, $messages);
 
         $file = __FILE__;
@@ -95,7 +95,7 @@ public function testHandleWithException()
 
         $collector->lateCollect();
 
-        $messages = iterator_to_array($collector->getMessages());
+        $messages = $collector->getMessages();
         $this->assertCount(1, $messages);
 
         $file = __FILE__;
@@ -145,7 +145,7 @@ public function testKeepsOrderedDispatchCalls()
 
         $collector->lateCollect();
 
-        $messages = iterator_to_array($collector->getMessages());
+        $messages = $collector->getMessages();
         $this->assertCount(5, $messages);
 
         $this->assertSame('#1', $messages[0]['message']['value']['message']);