Merge pull request #151 from php-enqueue/use-default-topic-for-router

[client] Use default as router topic.

Author: makasim

Diff for: pkg/enqueue-bundle/DependencyInjection/Configuration.php

@@ -44,7 +44,7 @@ public function getConfigTreeBuilder()
                 ->booleanNode('traceable_producer')->defaultFalse()->end()
                 ->scalarNode('prefix')->defaultValue('enqueue')->end()
                 ->scalarNode('app_name')->defaultValue('app')->end()
-                ->scalarNode('router_topic')->defaultValue('router')->cannotBeEmpty()->end()
+                ->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->scalarNode('router_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->scalarNode('router_processor')->defaultValue('enqueue.client.router_processor')->end()
                 ->scalarNode('default_processor_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()

Diff for: pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -145,7 +145,7 @@ public function testShouldSetDefaultConfigurationForClient()
                 'prefix' => 'enqueue',
                 'app_name' => 'app',
                 'router_processor' => 'enqueue.client.router_processor',
-                'router_topic' => 'router',
+                'router_topic' => 'default',
                 'router_queue' => 'default',
                 'default_processor_queue' => 'default',
                 'traceable_producer' => false,

Diff for: pkg/simple-client/SimpleClientContainerExtension.php

@@ -172,7 +172,7 @@ private function createConfiguration()
             ->arrayNode('client')->children()
                 ->scalarNode('prefix')->defaultValue('enqueue')->end()
                 ->scalarNode('app_name')->defaultValue('app')->end()
-                ->scalarNode('router_topic')->defaultValue('router')->cannotBeEmpty()->end()
+                ->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->scalarNode('router_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->scalarNode('default_processor_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->integerNode('redelivered_delay_time')->min(0)->defaultValue(0)->end()

Diff for: pkg/test/RetryTrait.php

@@ -14,6 +14,12 @@ public function runBare()
                 parent::runBare();
 
                 return;
+            } catch (\PHPUnit_Framework_IncompleteTestError $e) {
+                throw $e;
+            } catch (\PHPUnit_Framework_SkippedTestError $e) {
+                throw $e;
+            } catch (\Throwable $e) {
+                // last one thrown below
             } catch (\Exception $e) {
                 // last one thrown below
             }