bug #32700 [Messenger] Flatten collection of stamps collected by the traceable middleware (ogizanagi)

fabpot · fabpot · commit e06b0f04a635 · 2019-07-24T12:14:58.000+02:00
This PR was merged into the 4.2 branch. Discussion ---------- [Messenger] Flatten collection of stamps collected by the traceable middleware | Q | A | ------------- | --- | Branch? | 4.2  | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | N/A  | License | MIT | Doc PR | N/A ### before ![Capture d’écran 2019-07-24 à 10 04 07](https://user-images.githubusercontent.com/2211145/61776018-65a12680-adfa-11e9-9efd-bd6682a0a296.png) ![Capture d’écran 2019-07-24 à 09 57 59](https://user-images.githubusercontent.com/2211145/61775695-b1070500-adf9-11e9-9bab-ac740f296684.png) ### after ![Capture d’écran 2019-07-24 à 09 57 37](https://user-images.githubusercontent.com/2211145/61775694-b1070500-adf9-11e9-95bf-14dc4d63c2ae.png) Not sure how it qualifies, but I assume this wasn't entirely intentional when introducing the new `Envelope::all()` behavior in #29159. Note it'll affect #32680 as well once merged. Commits ------- 015fca7 [Messenger] Flatten collection of stamps collected by the traceable middleware
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),`