fix router topic name

Author: bendavies

Diff for: pkg/enqueue/Client/Config.php

@@ -103,7 +103,7 @@ public function getRouterProcessorName()
      */
     public function createTransportRouterTopicName($name)
     {
-        return trim(strtolower(trim($this->prefix).'.'.trim($name)), '.');
+        return $this->getQueueName($name);
     }
 
     /**
@@ -113,7 +113,7 @@ public function createTransportRouterTopicName($name)
      */
     public function createTransportQueueName($name)
     {
-        return trim(strtolower(trim($this->prefix).'.'.trim($this->appName).'.'.trim($name)), '.');
+        return $this->getQueueName($name);
     }
 
     /**
@@ -154,4 +154,14 @@ public static function create(
             $routerProcessorName ?: 'router'
         );
     }
+
+    /**
+     * @param string $name
+     *
+     * @return string
+     */
+    private function getQueueName($name)
+    {
+        return trim(strtolower(trim($this->prefix).'.'.trim($this->appName).'.'.trim($name)), '.');
+    }
 }

Diff for: pkg/enqueue/Tests/Client/ConfigTest.php

@@ -73,7 +73,7 @@ public function testShouldCreateRouterTopicName()
             'aRouterProcessorName'
         );
 
-        $this->assertEquals('aprefix.aname', $config->createTransportRouterTopicName('aName'));
+        $this->assertEquals('aprefix.aapp.aname', $config->createTransportRouterTopicName('aName'));
     }
 
     public function testShouldCreateProcessorQueueName()

Diff for: pkg/stomp/Tests/Client/RabbitMqStompDriverTest.php

@@ -483,7 +483,7 @@ public function testShouldSetupBroker()
         $managementClient
             ->expects($this->at(0))
             ->method('declareExchange')
-            ->with('prefix.routertopic', [
+            ->with('prefix.app.routertopic', [
                 'type' => 'fanout',
                 'durable' => true,
                 'auto_delete' => false,
@@ -503,7 +503,7 @@ public function testShouldSetupBroker()
         $managementClient
             ->expects($this->at(2))
             ->method('bind')
-            ->with('prefix.routertopic', 'prefix.app.routerqueue', 'prefix.app.routerqueue')
+            ->with('prefix.app.routertopic', 'prefix.app.routerqueue', 'prefix.app.routerqueue')
         ;
         $managementClient
             ->expects($this->at(3))
@@ -528,7 +528,7 @@ public function testShouldSetupBroker()
         $logger
             ->expects($this->at(0))
             ->method('debug')
-            ->with('[RabbitMqStompDriver] Declare router exchange: prefix.routertopic')
+            ->with('[RabbitMqStompDriver] Declare router exchange: prefix.app.routertopic')
         ;
         $logger
             ->expects($this->at(1))
@@ -538,7 +538,7 @@ public function testShouldSetupBroker()
         $logger
             ->expects($this->at(2))
             ->method('debug')
-            ->with('[RabbitMqStompDriver] Bind router queue to exchange: prefix.app.routerqueue -> prefix.routertopic')
+            ->with('[RabbitMqStompDriver] Bind router queue to exchange: prefix.app.routerqueue -> prefix.app.routertopic')
         ;
         $logger
             ->expects($this->at(3))