bug #30466 [Messenger] Make 'headers' key optional for encoded messages (yceruto)

fabpot · fabpot · commit 9c6049079896 · 2019-03-09T20:40:16.000+01:00
This PR was merged into the 4.2 branch. Discussion ---------- [Messenger] Make 'headers' key optional for encoded messages | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #30455 | License | MIT Commits ------- bb881c9 Make 'headers' key optional for encoded messages
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpSenderTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpSenderTest.php
@@ -37,4 +37,19 @@ public function testItSendsTheEncodedMessage()
         $sender = new AmqpSender($connection, $serializer);
         $sender->send($envelope);
     }
+
+    public function testItSendsTheEncodedMessageWithoutHeaders()
+    {
+        $envelope = new Envelope(new DummyMessage('Oy'));
+        $encoded = ['body' => '...'];
+
+        $serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
+        $serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
+
+        $connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
+        $connection->expects($this->once())->method('publish')->with($encoded['body'], []);
+
+        $sender = new AmqpSender($connection, $serializer);
+        $sender->send($envelope);
+    }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php
@@ -41,7 +41,7 @@ public function send(Envelope $envelope): Envelope
     {
         $encodedMessage = $this->serializer->encode($envelope);
 
-        $this->connection->publish($encodedMessage['body'], $encodedMessage['headers']);
+        $this->connection->publish($encodedMessage['body'], $encodedMessage['headers'] ?? []);
 
         return $envelope;
     }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function send(Envelope $envelope): Envelope`
`41`	`41`	`{`
`42`	`42`	`$encodedMessage = $this->serializer->encode($envelope);`
`43`	`43`
`44`		`- $this->connection->publish($encodedMessage['body'], $encodedMessage['headers']);`
	`44`	`+ $this->connection->publish($encodedMessage['body'], $encodedMessage['headers'] ?? []);`
`45`	`45`
`46`	`46`	`return $envelope;`
`47`	`47`	`}`