Binding options renamed for consistency

Mikhail Bakulin · Mikhail Bakulin · commit 54b48c448d37 · 2017-11-21T10:36:17.000+03:00
diff --git a/Configuration.php b/Configuration.php
@@ -75,8 +75,8 @@ class Configuration extends Component
             [
                 'exchange' => null,
                 'queue' => null,
-                'toExchange' => null,
-                'routingKeys' => [],
+                'to_exchange' => null,
+                'routing_keys' => [],
             ],
         ],
         'producers' => [
@@ -287,11 +287,11 @@ protected function validateRequired()
             if (!$this->isNameExist($this->exchanges, $binding['exchange'])) {
                 throw new InvalidConfigException("`{$binding['exchange']}` defined in binding doesn't configured in exchanges.");
             }
-            if (isset($binding['routingKeys']) && !is_array($binding['routingKeys'])) {
-                throw new InvalidConfigException('Option `routingKeys` should be an array.');
+            if (isset($binding['routing_keys']) && !is_array($binding['routing_keys'])) {
+                throw new InvalidConfigException('Option `routing_keys` should be an array.');
             }
-            if ((!isset($binding['queue']) && !isset($binding['toExchange'])) || isset($binding['queue'], $binding['toExchange'])) {
-                throw new InvalidConfigException('Either `queue` or `toExchange` options should be specified to create binding.');
+            if ((!isset($binding['queue']) && !isset($binding['to_exchange'])) || isset($binding['queue'], $binding['to_exchange'])) {
+                throw new InvalidConfigException('Either `queue` or `to_exchange` options should be specified to create binding.');
             }
             if (isset($binding['queue']) && !$this->isNameExist($this->queues, $binding['queue'])) {
                 throw new InvalidConfigException("`{$binding['queue']}` defined in binding doesn't configured in queues.");
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ return [
             [
                 'queue' => 'YOUR_QUEUE_NAME',
                 'exchange' => 'YOUR_EXCHANGE_NAME',
-                'routingKeys' => ['YOUR_ROUTING_KEY'],
+                'routing_keys' => ['YOUR_ROUTING_KEY'],
             ],
         ],
         'producers' => [
@@ -290,8 +290,8 @@ $rabbitmq_defaults = [
             [
                 'exchange' => null,
                 'queue' => null,
-                'toExchange' => null,
-                'routingKeys' => [],
+                'to_exchange' => null,
+                'routing_keys' => [],
             ],
         ],
         'producers' => [
diff --git a/components/Routing.php b/components/Routing.php
@@ -136,8 +136,8 @@ public function declareBindings()
      */
     public function bindExchangeToQueue(array $binding)
     {
-        if (isset($binding['routingKeys']) && count($binding['routingKeys']) > 0) {
-            foreach ($binding['routingKeys'] as $routingKey) {
+        if (isset($binding['routing_keys']) && count($binding['routing_keys']) > 0) {
+            foreach ($binding['routing_keys'] as $routingKey) {
                 // queue binding is not permitted on the default exchange
                 if ('' !== $binding['exchange']) {
                     $this->conn->channel()->queue_bind($binding['queue'], $binding['exchange'], $routingKey);
@@ -157,17 +157,17 @@ public function bindExchangeToQueue(array $binding)
      */
     public function bindExchangeToExchange(array $binding)
     {
-        if (isset($binding['routingKeys']) && count($binding['routingKeys']) > 0) {
-            foreach ($binding['routingKeys'] as $routingKey) {
+        if (isset($binding['routing_keys']) && count($binding['routing_keys']) > 0) {
+            foreach ($binding['routing_keys'] as $routingKey) {
                 // queue binding is not permitted on the default exchange
                 if ('' !== $binding['exchange']) {
-                    $this->conn->channel()->exchange_bind($binding['toExchange'], $binding['exchange'], $routingKey);
+                    $this->conn->channel()->exchange_bind($binding['to_exchange'], $binding['exchange'], $routingKey);
                 }
             }
         } else {
             // queue binding is not permitted on the default exchange
             if ('' !== $binding['exchange']) {
-                $this->conn->channel()->exchange_bind($binding['toExchange'], $binding['exchange']);
+                $this->conn->channel()->exchange_bind($binding['to_exchange'], $binding['exchange']);
             }
         }
     }
diff --git a/tests/ConfigurationTest.php b/tests/ConfigurationTest.php
@@ -78,8 +78,8 @@ public function invalidConfig()
             ['Queue wrong field', array_merge($required, ['queues' => [['wrong' => 'wrong']]]), InvalidConfigException::class],
             ['Exchange name is required for binding', array_merge($required, ['bindings' => [[]]]), InvalidConfigException::class],
             ['Routing key is required for binding', array_merge($required, ['bindings' => [['exchange' => 'smth']]]), InvalidConfigException::class],
-            ['Either `queue` or `toExchange` options should be specified to create binding', array_merge($required, ['bindings' => [['exchange' => 'smth', 'routingKey' => 'smth',]]]), InvalidConfigException::class],
-            ['Exchanges and queues should be configured in corresponding sections', array_merge($required, ['bindings' => [['exchange' => 'smth', 'routingKey' => 'smth', 'queue' => 'smth',]]]), InvalidConfigException::class],
+            ['Either `queue` or `to_exchange` options should be specified to create binding', array_merge($required, ['bindings' => [['exchange' => 'smth', 'routing_keys' => ['smth'],]]]), InvalidConfigException::class],
+            ['Exchanges and queues should be configured in corresponding sections', array_merge($required, ['bindings' => [['exchange' => 'smth', 'routing_keys' => ['smth'], 'queue' => 'smth',]]]), InvalidConfigException::class],
             ['Binding wrong field', array_merge($required, ['bindings' => [['wrong' => 'wrong']]]), InvalidConfigException::class],
             ['Producer wrong field', array_merge($required, ['producers' => [['wrong' => 'wrong']]]), InvalidConfigException::class],
             ['Producer name is required', array_merge($required, ['producers' => [[]]]), InvalidConfigException::class],
diff --git a/tests/DependencyInjectionTest.php b/tests/DependencyInjectionTest.php
@@ -45,7 +45,7 @@ public function testBootstrap()
                         [
                             'queue' => $name,
                             'exchange' => $name,
-                            'routingKeys' => [$name],
+                            'routing_keys' => [$name],
                         ],
                     ],
                     'producers' => [
diff --git a/tests/components/RoutingTest.php b/tests/components/RoutingTest.php
@@ -43,20 +43,20 @@ public function testRouting()
                         [
                             'queue' => $name,
                             'exchange' => $name,
-                            'routingKeys' => [$name],
+                            'routing_keys' => [$name],
                         ],
                         [
                             'exchange' => $name,
-                            'toExchange' => $name,
-                            'routingKeys' => [$name],
+                            'to_exchange' => $name,
+                            'routing_keys' => [$name],
                         ],
                         [
                             'queue' => $name,
                             'exchange' => $name,
                         ],
                         [
                             'exchange' => $name,
-                            'toExchange' => $name,
+                            'to_exchange' => $name,
                         ],
                         [
                             'queue' => '',

Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,8 @@ public function declareBindings()`
`136`	`136`	`*/`
`137`	`137`	`public function bindExchangeToQueue(array $binding)`
`138`	`138`	`{`
`139`		`- if (isset($binding['routingKeys']) && count($binding['routingKeys']) > 0) {`
`140`		`- foreach ($binding['routingKeys'] as $routingKey) {`
	`139`	`+ if (isset($binding['routing_keys']) && count($binding['routing_keys']) > 0) {`
	`140`	`+ foreach ($binding['routing_keys'] as $routingKey) {`
`141`	`141`	`// queue binding is not permitted on the default exchange`
`142`	`142`	`if ('' !== $binding['exchange']) {`
`143`	`143`	`$this->conn->channel()->queue_bind($binding['queue'], $binding['exchange'], $routingKey);`
`@@ -157,17 +157,17 @@ public function bindExchangeToQueue(array $binding)`
`157`	`157`	`*/`
`158`	`158`	`public function bindExchangeToExchange(array $binding)`
`159`	`159`	`{`
`160`		`- if (isset($binding['routingKeys']) && count($binding['routingKeys']) > 0) {`
`161`		`- foreach ($binding['routingKeys'] as $routingKey) {`
	`160`	`+ if (isset($binding['routing_keys']) && count($binding['routing_keys']) > 0) {`
	`161`	`+ foreach ($binding['routing_keys'] as $routingKey) {`
`162`	`162`	`// queue binding is not permitted on the default exchange`
`163`	`163`	`if ('' !== $binding['exchange']) {`
`164`		`- $this->conn->channel()->exchange_bind($binding['toExchange'], $binding['exchange'], $routingKey);`
	`164`	`+ $this->conn->channel()->exchange_bind($binding['to_exchange'], $binding['exchange'], $routingKey);`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`	`} else {`
`168`	`168`	`// queue binding is not permitted on the default exchange`
`169`	`169`	`if ('' !== $binding['exchange']) {`
`170`		`- $this->conn->channel()->exchange_bind($binding['toExchange'], $binding['exchange']);`
	`170`	`+ $this->conn->channel()->exchange_bind($binding['to_exchange'], $binding['exchange']);`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function testBootstrap()`
`45`	`45`	`[`
`46`	`46`	`'queue' => $name,`
`47`	`47`	`'exchange' => $name,`
`48`		`- 'routingKeys' => [$name],`
	`48`	`+ 'routing_keys' => [$name],`
`49`	`49`	`],`
`50`	`50`	`],`
`51`	`51`	`'producers' => [`
Original file line number	Diff line number	Diff line change
`@@ -43,20 +43,20 @@ public function testRouting()`
`43`	`43`	`[`
`44`	`44`	`'queue' => $name,`
`45`	`45`	`'exchange' => $name,`
`46`		`- 'routingKeys' => [$name],`
	`46`	`+ 'routing_keys' => [$name],`
`47`	`47`	`],`
`48`	`48`	`[`
`49`	`49`	`'exchange' => $name,`
`50`		`- 'toExchange' => $name,`
`51`		`- 'routingKeys' => [$name],`
	`50`	`+ 'to_exchange' => $name,`
	`51`	`+ 'routing_keys' => [$name],`
`52`	`52`	`],`
`53`	`53`	`[`
`54`	`54`	`'queue' => $name,`
`55`	`55`	`'exchange' => $name,`
`56`	`56`	`],`
`57`	`57`	`[`
`58`	`58`	`'exchange' => $name,`
`59`		`- 'toExchange' => $name,`
	`59`	`+ 'to_exchange' => $name,`
`60`	`60`	`],`
`61`	`61`	`[`
`62`	`62`	`'queue' => '',`