Skip to content

Commit b77a926

Browse files
committed
[client] Add ability to hard code the queue name.
- Move null transport to its own package
1 parent c2b268d commit b77a926

8 files changed

+16
-7
lines changed

DependencyInjection/Compiler/BuildQueueMetaRegistryPass.php

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ public function process(ContainerBuilder $container)
2828

2929
foreach ($subscriptions as $subscription) {
3030
$configs[$subscription['queueName']]['processors'][] = $subscription['processorName'];
31+
32+
if ($subscription['queueNameHardcoded']) {
33+
$configs[$subscription['queueName']]['transportName'] = $subscription['queueName'];
34+
}
3135
}
3236
}
3337

DependencyInjection/Compiler/ExtractProcessorTagSubscriptionsTrait.php

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ protected function extractSubscriptions(ContainerBuilder $container, $processorS
3838
$subscriptionPrototype = [
3939
'topicName' => null,
4040
'queueName' => null,
41+
'queueNameHardcoded' => false,
4142
'processorName' => null,
4243
];
4344

@@ -48,6 +49,7 @@ protected function extractSubscriptions(ContainerBuilder $container, $processorS
4849
$data[] = [
4950
'topicName' => $params,
5051
'queueName' => $defaultQueueName,
52+
'queueNameHardcoded' => false,
5153
'processorName' => $processorServiceId,
5254
];
5355
} elseif (is_array($params)) {
@@ -56,6 +58,7 @@ protected function extractSubscriptions(ContainerBuilder $container, $processorS
5658
$data[] = [
5759
'topicName' => $topicName,
5860
'queueName' => $resolve($params['queueName']) ?: $defaultQueueName,
61+
'queueNameHardcoded' => $resolve($params['queueNameHardcoded']),
5962
'processorName' => $resolve($params['processorName']) ?: $processorServiceId,
6063
];
6164
} else {
@@ -76,6 +79,7 @@ protected function extractSubscriptions(ContainerBuilder $container, $processorS
7679
$data[] = [
7780
'topicName' => $resolve($tagAttribute['topicName']),
7881
'queueName' => $resolve($tagAttribute['queueName']) ?: $defaultQueueName,
82+
'queueNameHardcoded' => $resolve($tagAttribute['queueNameHardcoded']),
7983
'processorName' => $resolve($tagAttribute['processorName']) ?: $processorServiceId,
8084
];
8185
}

EnqueueBundle.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use Enqueue\Stomp\Symfony\RabbitMqStompTransportFactory;
2222
use Enqueue\Stomp\Symfony\StompTransportFactory;
2323
use Enqueue\Symfony\DefaultTransportFactory;
24-
use Enqueue\Symfony\NullTransportFactory;
24+
use Enqueue\Null\Symfony\NullTransportFactory;
2525
use Symfony\Component\DependencyInjection\ContainerBuilder;
2626
use Symfony\Component\HttpKernel\Bundle\Bundle;
2727

Tests/Functional/QueuesCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function testCouldBeGetFromContainerAsService()
1717
$this->assertInstanceOf(QueuesCommand::class, $command);
1818
}
1919

20-
public function testShouldDisplayRegisteredDestionations()
20+
public function testShouldDisplayRegisteredQueues()
2121
{
2222
$command = $this->container->get('enqueue.client.meta.queues_command');
2323

Tests/Unit/DependencyInjection/ConfigurationTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Enqueue\Bundle\DependencyInjection\Configuration;
66
use Enqueue\Bundle\Tests\Unit\Mocks\FooTransportFactory;
77
use Enqueue\Symfony\DefaultTransportFactory;
8-
use Enqueue\Symfony\NullTransportFactory;
8+
use Enqueue\Null\Symfony\NullTransportFactory;
99
use Enqueue\Test\ClassExtensionTrait;
1010
use Symfony\Component\Config\Definition\ConfigurationInterface;
1111
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;

Tests/Unit/DependencyInjection/EnqueueExtensionTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
use Enqueue\Client\Producer;
99
use Enqueue\Client\TraceableProducer;
1010
use Enqueue\Symfony\DefaultTransportFactory;
11-
use Enqueue\Symfony\NullTransportFactory;
11+
use Enqueue\Null\Symfony\NullTransportFactory;
1212
use Enqueue\Test\ClassExtensionTrait;
13-
use Enqueue\Transport\Null\NullContext;
13+
use Enqueue\Null\NullContext;
1414
use Symfony\Component\DependencyInjection\ContainerBuilder;
1515
use Symfony\Component\DependencyInjection\Reference;
1616
use Symfony\Component\HttpKernel\DependencyInjection\Extension;

Tests/Unit/EnqueueBundleTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Enqueue\Stomp\Symfony\RabbitMqStompTransportFactory;
1818
use Enqueue\Stomp\Symfony\StompTransportFactory;
1919
use Enqueue\Symfony\DefaultTransportFactory;
20-
use Enqueue\Symfony\NullTransportFactory;
20+
use Enqueue\Null\Symfony\NullTransportFactory;
2121
use Enqueue\Test\ClassExtensionTrait;
2222
use Symfony\Component\DependencyInjection\ContainerBuilder;
2323
use Symfony\Component\HttpKernel\Bundle\Bundle;

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"require": {
1414
"php": ">=5.6",
1515
"symfony/framework-bundle": "^2.8|^3",
16-
"enqueue/enqueue": "^0.3"
16+
"enqueue/enqueue": "^0.3",
17+
"enqueue/null": "^0.3"
1718
},
1819
"require-dev": {
1920
"phpunit/phpunit": "~5.5",

0 commit comments

Comments
 (0)