Allow to disable the auto-setup of the connection

sroze · sroze · commit 1bf2589fbb16 · 2018-04-17T00:27:06.000+01:00
diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php
@@ -94,7 +94,7 @@ public static function fromDsn(string $dsn, array $options = array(), bool $debu
      */
     public function publish(string $body, array $headers = array()): void
     {
-        if ($this->debug) {
+        if ($this->debug && $this->shouldSetup()) {
             $this->setup();
         }
 
@@ -108,7 +108,7 @@ public function publish(string $body, array $headers = array()): void
      */
     public function get(): ?\AMQPEnvelope
     {
-        if ($this->debug) {
+        if ($this->debug && $this->shouldSetup()) {
             $this->setup();
         }
 
@@ -117,7 +117,7 @@ public function get(): ?\AMQPEnvelope
                 return $message;
             }
         } catch (\AMQPQueueException $e) {
-            if (404 === $e->getCode()) {
+            if (404 === $e->getCode() && $this->shouldSetup()) {
                 // If we get a 404 for the queue, it means we need to setup the exchange & queue.
                 $this->setup();
 
@@ -215,4 +215,9 @@ private function clear(): void
         $this->amqpQueue = null;
         $this->amqpExchange = null;
     }
+
+    private function shouldSetup(): bool
+    {
+        return array_key_exists('auto-setup', $this->connectionCredentials) ? 'false' !== $this->connectionCredentials['auto-setup'] : true;
+    }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php
@@ -147,6 +147,42 @@ public function testItAllowsToUseAPersistentConnection()
         $connection = Connection::fromDsn('amqp://localhost/%2f/messages?persistent=true', array(), false, $factory);
         $connection->publish('body');
     }
+
+    public function testItSetupsTheConnectionWhenDebug()
+    {
+        $factory = new TestAmqpFactory(
+            $amqpConnection = $this->getMockBuilder(\AMQPConnection::class)->disableOriginalConstructor()->getMock(),
+            $amqpChannel = $this->getMockBuilder(\AMQPChannel::class)->disableOriginalConstructor()->getMock(),
+            $amqpQueue = $this->getMockBuilder(\AMQPQueue::class)->disableOriginalConstructor()->getMock(),
+            $amqpExchange = $this->getMockBuilder(\AMQPExchange::class)->disableOriginalConstructor()->getMock()
+        );
+
+        $amqpExchange->method('getName')->willReturn('exchange_name');
+        $amqpExchange->expects($this->once())->method('declareExchange');
+        $amqpQueue->expects($this->once())->method('declareQueue');
+        $amqpQueue->expects($this->once())->method('bind')->with('exchange_name', 'my_key');
+
+        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key', array(), true, $factory);
+        $connection->publish('body');
+    }
+
+    public function testItCanDisableTheSetup()
+    {
+        $factory = new TestAmqpFactory(
+            $amqpConnection = $this->getMockBuilder(\AMQPConnection::class)->disableOriginalConstructor()->getMock(),
+            $amqpChannel = $this->getMockBuilder(\AMQPChannel::class)->disableOriginalConstructor()->getMock(),
+            $amqpQueue = $this->getMockBuilder(\AMQPQueue::class)->disableOriginalConstructor()->getMock(),
+            $amqpExchange = $this->getMockBuilder(\AMQPExchange::class)->disableOriginalConstructor()->getMock()
+        );
+
+        $amqpExchange->method('getName')->willReturn('exchange_name');
+        $amqpExchange->expects($this->never())->method('declareExchange');
+        $amqpQueue->expects($this->never())->method('declareQueue');
+        $amqpQueue->expects($this->never())->method('bind');
+
+        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key', array('auto-setup' => 'false'), true, $factory);
+        $connection->publish('body');
+    }
 }
 
 class TestAmqpFactory extends AmqpFactory

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public static function fromDsn(string $dsn, array $options = array(), bool $debu`
`94`	`94`	`*/`
`95`	`95`	`public function publish(string $body, array $headers = array()): void`
`96`	`96`	`{`
`97`		`- if ($this->debug) {`
	`97`	`+ if ($this->debug && $this->shouldSetup()) {`
`98`	`98`	`$this->setup();`
`99`	`99`	`}`
`100`	`100`
`@@ -108,7 +108,7 @@ public function publish(string $body, array $headers = array()): void`
`108`	`108`	`*/`
`109`	`109`	`public function get(): ?\AMQPEnvelope`
`110`	`110`	`{`
`111`		`- if ($this->debug) {`
	`111`	`+ if ($this->debug && $this->shouldSetup()) {`
`112`	`112`	`$this->setup();`
`113`	`113`	`}`
`114`	`114`
`@@ -117,7 +117,7 @@ public function get(): ?\AMQPEnvelope`
`117`	`117`	`return $message;`
`118`	`118`	`}`
`119`	`119`	`} catch (\AMQPQueueException $e) {`
`120`		`- if (404 === $e->getCode()) {`
	`120`	`+ if (404 === $e->getCode() && $this->shouldSetup()) {`
`121`	`121`	`// If we get a 404 for the queue, it means we need to setup the exchange & queue.`
`122`	`122`	`$this->setup();`
`123`	`123`
`@@ -215,4 +215,9 @@ private function clear(): void`
`215`	`215`	`$this->amqpQueue = null;`
`216`	`216`	`$this->amqpExchange = null;`
`217`	`217`	`}`
	`218`	`+`
	`219`	`+ private function shouldSetup(): bool`
	`220`	`+ {`
	`221`	`+ return array_key_exists('auto-setup', $this->connectionCredentials) ? 'false' !== $this->connectionCredentials['auto-setup'] : true;`
	`222`	`+ }`
`218`	`223`	`}`