bug #32413 [Messenger] fix publishing headers set on AmqpStamp (Tobion)

fabpot · fabpot · commit bb9251a42a23 · 2019-07-08T08:20:10.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Messenger] fix publishing headers set on AmqpStamp | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | | License | MIT | Doc PR | Dispatching a message using an AmqpStamp and setting extra headers with it didn't work. We need to merge the `$attribute['headers']`, not the attributes itself as that will ignore the stamp headers because it's not recursive. I also made the AmqpStamp a NonSendableStampInterface because it's pointless to serialize the stamp because the stamp already set's the attributes for publishing. Commits ------- 50b3ec4 [Messenger] fix publishing headers set on AmqpStamp
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php
@@ -418,6 +418,21 @@ public function testObfuscatePasswordInDsn()
         $connection->channel();
     }
 
+    public function testAmqpStampHeadersAreUsed()
+    {
+        $factory = new TestAmqpFactory(
+            $this->createMock(\AMQPConnection::class),
+            $this->createMock(\AMQPChannel::class),
+            $this->createMock(\AMQPQueue::class),
+            $amqpExchange = $this->createMock(\AMQPExchange::class)
+        );
+
+        $amqpExchange->expects($this->once())->method('publish')->with('body', null, AMQP_NOPARAM, ['headers' => ['Foo' => 'X', 'Bar' => 'Y']]);
+
+        $connection = Connection::fromDsn('amqp://localhost', [], $factory);
+        $connection->publish('body', ['Foo' => 'X'], 0, new AmqpStamp(null, AMQP_NOPARAM, ['headers' => ['Bar' => 'Y']]));
+    }
+
     public function testItCanPublishWithTheDefaultRoutingKey()
     {
         $factory = new TestAmqpFactory(
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpStamp.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpStamp.php
@@ -11,15 +11,15 @@
 
 namespace Symfony\Component\Messenger\Transport\AmqpExt;
 
-use Symfony\Component\Messenger\Stamp\StampInterface;
+use Symfony\Component\Messenger\Stamp\NonSendableStampInterface;
 
 /**
  * @author Guillaume Gammelin <ggammelin@gmail.com>
  * @author Samuel Roze <samuel.roze@gmail.com>
  *
  * @experimental in 4.3
  */
-final class AmqpStamp implements StampInterface
+final class AmqpStamp implements NonSendableStampInterface
 {
     private $routingKey;
     private $flags;
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php
@@ -191,9 +191,7 @@ public function publish(string $body, array $headers = [], int $delay = 0, AmqpS
             $this->exchange(),
             $body,
             $this->getRoutingKeyForMessage($amqpStamp),
-            [
-                'headers' => $headers,
-            ],
+            $headers,
             $amqpStamp
         );
     }
@@ -223,20 +221,21 @@ private function publishWithDelay(string $body, array $headers, int $delay, Amqp
             $this->getDelayExchange(),
             $body,
             $this->getRoutingKeyForDelay($delay, $routingKey),
-            [
-                'headers' => $headers,
-            ],
+            $headers,
             $amqpStamp
         );
     }
 
-    private function publishOnExchange(\AMQPExchange $exchange, string $body, string $routingKey = null, array $attributes = [], AmqpStamp $amqpStamp = null)
+    private function publishOnExchange(\AMQPExchange $exchange, string $body, string $routingKey = null, array $headers = [], AmqpStamp $amqpStamp = null)
     {
+        $attributes = $amqpStamp ? $amqpStamp->getAttributes() : [];
+        $attributes['headers'] = array_merge($headers, $attributes['headers'] ?? []);
+
         $exchange->publish(
             $body,
             $routingKey,
             $amqpStamp ? $amqpStamp->getFlags() : AMQP_NOPARAM,
-            array_merge($amqpStamp ? $amqpStamp->getAttributes() : [], $attributes)
+            $attributes
         );
     }
 
