Merge pull request #70 from softonic/master

Allow multiple queue bindings
bschmitt · May 13, 2020 · a571a54 · a571a54
2 parents f2102e3 + 1a8a1fe
commit a571a54
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 5 deletions.
diff --git a/src/Request.php b/src/Request.php
@@ -121,11 +121,13 @@ public function setup()
                 $this->getProperty('queue_properties')
             );
 
-            $this->channel->queue_bind(
-                $queue ?: $this->queueInfo[0],
-                $exchange,
-                $this->getProperty('routing')
-            );
+            foreach ((array) $this->getProperty('routing') as $routingKey) {
+                $this->channel->queue_bind(
+                    $queue ?: $this->queueInfo[0],
+                    $exchange,
+                    $routingKey
+                );
+            }
         }
         // clear at shutdown
         $this->connection->set_close_on_destruct(true);

diff --git a/test/RequestTest.php b/test/RequestTest.php
@@ -82,6 +82,54 @@ public function testIfQueueGetsDeclaredAndBoundIfInConfig()
 
     }
 
+    public function testIfQueueGetsDeclaredAndBoundToDifferentRoutingKeysIfInConfig()
+    {
+
+        $queueName = 'amqp-test';
+        $routing = [
+            'routing-test-1',
+            'routing-test-2',
+        ];
+
+        $this->requestMock->mergeProperties([
+            'queue' => $queueName,
+            'queue_force_declare' => true,
+            'routing' => $routing
+        ]);
+        $this->channelMock->shouldReceive('exchange_declare');
+        $this->requestMock->shouldReceive('connect');
+
+        $this->channelMock->shouldReceive('queue_declare')
+                          ->with(
+                              $queueName,
+                              $this->defaultConfig['queue_passive'],
+                              $this->defaultConfig['queue_durable'],
+                              $this->defaultConfig['queue_exclusive'],
+                              $this->defaultConfig['queue_auto_delete'],
+                              $this->defaultConfig['queue_nowait'],
+                              $this->defaultConfig['queue_properties']
+                          )
+                          ->andReturn([$queueName, 4])
+                          ->times(1);
+        $this->channelMock->shouldReceive('queue_bind')
+                          ->with(
+                              $queueName,
+                              $this->defaultConfig['exchange'],
+                              $routing[0]
+                            )
+                          ->times(1);
+        $this->channelMock->shouldReceive('queue_bind')
+                          ->with(
+                              $queueName,
+                              $this->defaultConfig['exchange'],
+                              $routing[1]
+                            )
+                          ->times(1);
+        $this->connectionMock->shouldReceive('set_close_on_destruct')->with(true)->times(1);
+        $this->requestMock->setup();
+
+    }
+
     public function testQueueMessageCountShouldBeZeroIfQueueinfoIsNotSet()
     {