feature #32489 [Messenger] Allow exchange type headers binding (CedrickOka)

fabpot · fabpot · commit 3596948231dd · 2019-08-18T19:17:21.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Messenger] Allow exchange type headers binding | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #29983 | License | MIT | Doc PR | ø Taken over #29983, as a feature for 4.4. [Apparently useful](https://www.cloudamqp.com/blog/2015-09-03-part4-rabbitmq-for-beginners-exchanges-routing-keys-bindings.html). Commits ------- 3211caa Allow exchange type headers binding
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php
@@ -273,6 +273,33 @@ public function testItSetupsTheConnection()
         $connection->publish('body');
     }
 
+    public function testBindingArguments()
+    {
+        $amqpConnection = $this->createMock(\AMQPConnection::class);
+        $amqpChannel = $this->createMock(\AMQPChannel::class);
+        $amqpExchange = $this->createMock(\AMQPExchange::class);
+        $amqpQueue = $this->createMock(\AMQPQueue::class);
+
+        $factory = $this->createMock(AmqpFactory::class);
+        $factory->method('createConnection')->willReturn($amqpConnection);
+        $factory->method('createChannel')->willReturn($amqpChannel);
+        $factory->method('createExchange')->willReturn($amqpExchange);
+        $factory->method('createQueue')->willReturn($amqpQueue);
+
+        $amqpExchange->expects($this->once())->method('declareExchange');
+        $amqpExchange->expects($this->once())->method('publish')->with('body', null, AMQP_NOPARAM, ['headers' => []]);
+        $amqpQueue->expects($this->once())->method('declareQueue');
+        $amqpQueue->expects($this->exactly(1))->method('bind')->withConsecutive(
+            [self::DEFAULT_EXCHANGE_NAME, null, ['x-match' => 'all']]
+        );
+
+        $dsn = 'amqp://localhost?exchange[type]=headers'.
+            '&queues[queue0][binding_arguments][x-match]=all';
+
+        $connection = Connection::fromDsn($dsn, [], $factory);
+        $connection->publish('body');
+    }
+
     public function testItCanDisableTheSetup()
     {
         $factory = new TestAmqpFactory(
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php
@@ -81,6 +81,7 @@ public function __construct(array $connectionOptions, array $exchangeOptions, ar
      *   * password: Password to use the connect to the AMQP service
      *   * queues[name]: An array of queues, keyed by the name
      *     * binding_keys: The binding keys (if any) to bind to this queue
+     *     * binding_arguments: Arguments to be used while binding the queue.
      *     * flags: Queue flags (Default: AMQP_DURABLE)
      *     * arguments: Extra arguments
      *   * exchange:
@@ -349,7 +350,7 @@ private function setupExchangeAndQueues(): void
         foreach ($this->queuesOptions as $queueName => $queueConfig) {
             $this->queue($queueName)->declareQueue();
             foreach ($queueConfig['binding_keys'] ?? [null] as $bindingKey) {
-                $this->queue($queueName)->bind($this->exchangeOptions['name'], $bindingKey);
+                $this->queue($queueName)->bind($this->exchangeOptions['name'], $bindingKey, $queueConfig['binding_arguments'] ?? []);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ public function __construct(array $connectionOptions, array $exchangeOptions, ar`
`81`	`81`	`* * password: Password to use the connect to the AMQP service`
`82`	`82`	`* * queues[name]: An array of queues, keyed by the name`
`83`	`83`	`* * binding_keys: The binding keys (if any) to bind to this queue`
	`84`	`+ * * binding_arguments: Arguments to be used while binding the queue.`
`84`	`85`	`* * flags: Queue flags (Default: AMQP_DURABLE)`
`85`	`86`	`* * arguments: Extra arguments`
`86`	`87`	`* * exchange:`
`@@ -349,7 +350,7 @@ private function setupExchangeAndQueues(): void`
`349`	`350`	`foreach ($this->queuesOptions as $queueName => $queueConfig) {`
`350`	`351`	`$this->queue($queueName)->declareQueue();`
`351`	`352`	`foreach ($queueConfig['binding_keys'] ?? [null] as $bindingKey) {`
`352`		`- $this->queue($queueName)->bind($this->exchangeOptions['name'], $bindingKey);`
	`353`	`+ $this->queue($queueName)->bind($this->exchangeOptions['name'], $bindingKey, $queueConfig['binding_arguments'] ?? []);`
`353`	`354`	`}`
`354`	`355`	`}`
`355`	`356`	`}`