[Messenger] Flatten collection of stamps collected by the traceable middleware

ogizanagi · ogizanagi · commit 015fca74050d · 2019-07-24T09:56:23.000+02:00
diff --git a/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php b/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
@@ -56,7 +56,7 @@ public function testItTracesDispatchWithEnvelope()
         $this->assertCount(1, $tracedMessages = $traceableBus->getDispatchedMessages());
         $this->assertArraySubset([
             'message' => $message,
-            'stamps' => [[$stamp]],
+            'stamps' => [$stamp],
             'caller' => [
                 'name' => 'TraceableMessageBusTest.php',
                 'file' => __FILE__,
diff --git a/src/Symfony/Component/Messenger/TraceableMessageBus.php b/src/Symfony/Component/Messenger/TraceableMessageBus.php
@@ -33,7 +33,7 @@ public function dispatch($message): Envelope
     {
         $envelope = $message instanceof Envelope ? $message : new Envelope($message);
         $context = [
-            'stamps' => array_values($envelope->all()),
+            'stamps' => array_merge([], ...array_values($envelope->all())),
             'message' => $envelope->getMessage(),
             'caller' => $this->getCaller(),
             'callTime' => microtime(true),

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function dispatch($message): Envelope`
`33`	`33`	`{`
`34`	`34`	`$envelope = $message instanceof Envelope ? $message : new Envelope($message);`
`35`	`35`	`$context = [`
`36`		`- 'stamps' => array_values($envelope->all()),`
	`36`	`+ 'stamps' => array_merge([], ...array_values($envelope->all())),`
`37`	`37`	`'message' => $envelope->getMessage(),`
`38`	`38`	`'caller' => $this->getCaller(),`
`39`	`39`	`'callTime' => microtime(true),`