[Messenger] rename auto-setup amqp option into auto_setup

dmaicher · dmaicher · commit 6263e4839244 · 2019-03-26T11:03:16.000+01:00
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -49,7 +49,7 @@ CHANGELOG
    both no longer have `$isDebug` arguments.
  * [BC BREAK] The Amqp Transport now automatically sets up the exchanges
    and queues by default. Previously, this was done when in "debug" mode
-   only. Pass the `auto-setup` connection option to control this.
+   only. Pass the `auto_setup` connection option to control this.
 
 4.2.0
 -----
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php
@@ -228,13 +228,13 @@ public function testItCanDisableTheSetup()
         $amqpQueue->expects($this->never())->method('declareQueue');
         $amqpQueue->expects($this->never())->method('bind');
 
-        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key', ['auto-setup' => 'false'], $factory);
+        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key', ['auto_setup' => 'false'], $factory);
         $connection->publish('body');
 
-        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key', ['auto-setup' => false], $factory);
+        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key', ['auto_setup' => false], $factory);
         $connection->publish('body');
 
-        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key&auto-setup=false', [], $factory);
+        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key&auto_setup=false', [], $factory);
         $connection->publish('body');
     }
 
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php
@@ -82,7 +82,7 @@ class Connection
      *     * routing_key_pattern: The pattern of the routing key (Default: "delay_%delay%")
      *     * queue_name_pattern: Pattern to use to create the queues (Default: "delay_queue_%delay%")
      *     * exchange_name: Name of the exchange to be used for the retried messages (Default: "retry")
-     *   * auto-setup: Enable or not the auto-setup of queues and exchanges (Default: true)
+     *   * auto_setup: Enable or not the auto-setup of queues and exchanges (Default: true)
      *   * loop_sleep: Amount of micro-seconds to wait if no message are available (Default: 200000)
      */
     public function __construct(array $connectionConfiguration, array $exchangeConfiguration, array $queueConfiguration, AmqpFactory $amqpFactory = null)
@@ -373,11 +373,11 @@ private function clear(): void
 
     private function shouldSetup(): bool
     {
-        if (!\array_key_exists('auto-setup', $this->connectionConfiguration)) {
+        if (!\array_key_exists('auto_setup', $this->connectionConfiguration)) {
             return true;
         }
 
-        if (\in_array($this->connectionConfiguration['auto-setup'], [false, 'false'], true)) {
+        if (\in_array($this->connectionConfiguration['auto_setup'], [false, 'false'], true)) {
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class Connection`
`82`	`82`	`* * routing_key_pattern: The pattern of the routing key (Default: "delay_%delay%")`
`83`	`83`	`* * queue_name_pattern: Pattern to use to create the queues (Default: "delay_queue_%delay%")`
`84`	`84`	`* * exchange_name: Name of the exchange to be used for the retried messages (Default: "retry")`
`85`		`- * * auto-setup: Enable or not the auto-setup of queues and exchanges (Default: true)`
	`85`	`+ * * auto_setup: Enable or not the auto-setup of queues and exchanges (Default: true)`
`86`	`86`	`* * loop_sleep: Amount of micro-seconds to wait if no message are available (Default: 200000)`
`87`	`87`	`*/`
`88`	`88`	`public function __construct(array $connectionConfiguration, array $exchangeConfiguration, array $queueConfiguration, AmqpFactory $amqpFactory = null)`
`@@ -373,11 +373,11 @@ private function clear(): void`
`373`	`373`
`374`	`374`	`private function shouldSetup(): bool`
`375`	`375`	`{`
`376`		`- if (!\array_key_exists('auto-setup', $this->connectionConfiguration)) {`
	`376`	`+ if (!\array_key_exists('auto_setup', $this->connectionConfiguration)) {`
`377`	`377`	`return true;`
`378`	`378`	`}`
`379`	`379`
`380`		`- if (\in_array($this->connectionConfiguration['auto-setup'], [false, 'false'], true)) {`
	`380`	`+ if (\in_array($this->connectionConfiguration['auto_setup'], [false, 'false'], true)) {`
`381`	`381`	`return false;`
`382`	`382`	`}`
`383`	`383`