Merge pull request #50 from joorloohuis/master

Mikhail Bakulin · web-flow · commit aa66e6f7e8a4 · 2020-07-05T20:09:20.000+02:00
fix copy/paste error that preventede exchanges from being deleted
diff --git a/components/Routing.php b/components/Routing.php
@@ -93,7 +93,7 @@ public function declareQueue(string $queueName)
             throw new RuntimeException("Queue `{$queueName}` is not configured.");
         }
 
-        $channel = 
+        $channel =
         $queue = $this->queues[$queueName];
         if (!isset($this->queuesDeclared[$queueName])) {
             if (ArrayHelper::isAssociative($queue)) {
@@ -254,8 +254,8 @@ public function deleteQueue(string $queueName)
      */
     public function deleteExchange(string $exchangeName)
     {
-        if (!isset($this->queues[$exchangeName])) {
-            throw new RuntimeException("Queue {$exchangeName} is not configured. Delete is aborted.");
+        if (!isset($this->exchanges[$exchangeName])) {
+            throw new RuntimeException("Exchange {$exchangeName} is not configured. Delete is aborted.");
         }
         $this->getChannel()->exchange_delete($exchangeName);
     }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function declareQueue(string $queueName)`
`93`	`93`	throw new RuntimeException("Queue `{$queueName}` is not configured.");
`94`	`94`	`}`
`95`	`95`
`96`		`- $channel =`
	`96`	`+ $channel =`
`97`	`97`	`$queue = $this->queues[$queueName];`
`98`	`98`	`if (!isset($this->queuesDeclared[$queueName])) {`
`99`	`99`	`if (ArrayHelper::isAssociative($queue)) {`
`@@ -254,8 +254,8 @@ public function deleteQueue(string $queueName)`
`254`	`254`	`*/`
`255`	`255`	`public function deleteExchange(string $exchangeName)`
`256`	`256`	`{`
`257`		`- if (!isset($this->queues[$exchangeName])) {`
`258`		`- throw new RuntimeException("Queue {$exchangeName} is not configured. Delete is aborted.");`
	`257`	`+ if (!isset($this->exchanges[$exchangeName])) {`
	`258`	`+ throw new RuntimeException("Exchange {$exchangeName} is not configured. Delete is aborted.");`
`259`	`259`	`}`
`260`	`260`	`$this->getChannel()->exchange_delete($exchangeName);`
`261`	`261`	`}`