Skip to content

Commit 06fd596

Browse files
authored
Merge pull request #151 from php-enqueue/use-default-topic-for-router
[client] Use default as router topic.
2 parents 918bff6 + a24f1ed commit 06fd596

4 files changed

Lines changed: 9 additions & 3 deletions

File tree

‎pkg/enqueue-bundle/DependencyInjection/Configuration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getConfigTreeBuilder()
4444
->booleanNode('traceable_producer')->defaultFalse()->end()
4545
->scalarNode('prefix')->defaultValue('enqueue')->end()
4646
->scalarNode('app_name')->defaultValue('app')->end()
47-
->scalarNode('router_topic')->defaultValue('router')->cannotBeEmpty()->end()
47+
->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
4848
->scalarNode('router_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
4949
->scalarNode('router_processor')->defaultValue('enqueue.client.router_processor')->end()
5050
->scalarNode('default_processor_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()

‎pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function testShouldSetDefaultConfigurationForClient()
145145
'prefix' => 'enqueue',
146146
'app_name' => 'app',
147147
'router_processor' => 'enqueue.client.router_processor',
148-
'router_topic' => 'router',
148+
'router_topic' => 'default',
149149
'router_queue' => 'default',
150150
'default_processor_queue' => 'default',
151151
'traceable_producer' => false,

‎pkg/simple-client/SimpleClientContainerExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private function createConfiguration()
172172
->arrayNode('client')->children()
173173
->scalarNode('prefix')->defaultValue('enqueue')->end()
174174
->scalarNode('app_name')->defaultValue('app')->end()
175-
->scalarNode('router_topic')->defaultValue('router')->cannotBeEmpty()->end()
175+
->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
176176
->scalarNode('router_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
177177
->scalarNode('default_processor_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
178178
->integerNode('redelivered_delay_time')->min(0)->defaultValue(0)->end()

‎pkg/test/RetryTrait.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ public function runBare()
1414
parent::runBare();
1515

1616
return;
17+
} catch (\PHPUnit_Framework_IncompleteTestError $e) {
18+
throw $e;
19+
} catch (\PHPUnit_Framework_SkippedTestError $e) {
20+
throw $e;
21+
} catch (\Throwable $e) {
22+
// last one thrown below
1723
} catch (\Exception $e) {
1824
// last one thrown below
1925
}

0 commit comments

Comments
 (0)