Rework exclusive command extension.

Author: makasim

DependencyInjection/Compiler/BuildExclusiveCommandsExtensionPass.php

@@ -6,12 +6,14 @@
 use Enqueue\AsyncEventDispatcher\DependencyInjection\AsyncEventsPass;
 use Enqueue\AsyncEventDispatcher\DependencyInjection\AsyncTransformersPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildClientExtensionsPass;
-use Enqueue\Bundle\DependencyInjection\Compiler\BuildClientRoutingPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildConsumptionExtensionsPass;
-use Enqueue\Bundle\DependencyInjection\Compiler\BuildExclusiveCommandsExtensionPass;
-use Enqueue\Bundle\DependencyInjection\Compiler\BuildProcessorRegistryPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildQueueMetaRegistryPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildTopicMetaSubscribersPass;
+use Enqueue\Symfony\DependencyInjection\AnalyzeRouteCollectionPass;
+use Enqueue\Symfony\DependencyInjection\BuildCommandSubscriberRoutesPass;
+use Enqueue\Symfony\DependencyInjection\BuildProcessorRegistryPass;
+use Enqueue\Symfony\DependencyInjection\BuildProcessorRoutesPass;
+use Enqueue\Symfony\DependencyInjection\BuildTopicSubscriberRoutesPass;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -21,12 +23,15 @@ class EnqueueBundle extends Bundle
     public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new BuildConsumptionExtensionsPass());
-        $container->addCompilerPass(new BuildClientRoutingPass());
-        $container->addCompilerPass(new BuildProcessorRegistryPass());
         $container->addCompilerPass(new BuildTopicMetaSubscribersPass());
         $container->addCompilerPass(new BuildQueueMetaRegistryPass());
         $container->addCompilerPass(new BuildClientExtensionsPass());
-        $container->addCompilerPass(new BuildExclusiveCommandsExtensionPass());
+
+        $container->addCompilerPass(new BuildTopicSubscriberRoutesPass('default'), 100);
+        $container->addCompilerPass(new BuildCommandSubscriberRoutesPass('default'), 100);
+        $container->addCompilerPass(new BuildProcessorRoutesPass('default'), 100);
+        $container->addCompilerPass(new AnalyzeRouteCollectionPass('default'), 30);
+        $container->addCompilerPass(new BuildProcessorRegistryPass('default'));
 
         if (class_exists(AsyncEventDispatcherExtension::class)) {
             $container->addCompilerPass(new AsyncEventsPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);

EnqueueBundle.php

@@ -219,3 +219,9 @@ services:
     enqueue.flush_spool_producer_listener:
         public: true
         alias: 'Enqueue\Symfony\Client\FlushSpoolProducerListener'
+
+    enqueue.client.default.exclusive_command_extension:
+        class: 'Enqueue\Client\ConsumptionExtension\ExclusiveCommandExtension'
+        arguments: '@enqueue.client.default.driver'
+        tags:
+            - { name: 'enqueue.client.extension' }

Resources/config/client.yml

@@ -3,9 +3,7 @@
 namespace Enqueue\Bundle\Tests\Unit;
 
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildClientExtensionsPass;
-use Enqueue\Bundle\DependencyInjection\Compiler\BuildClientRoutingPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildConsumptionExtensionsPass;
-use Enqueue\Bundle\DependencyInjection\Compiler\BuildExclusiveCommandsExtensionPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildProcessorRegistryPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildQueueMetaRegistryPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildTopicMetaSubscribersPass;
@@ -37,11 +35,6 @@ public function testShouldRegisterExpectedCompilerPasses()
             ->method('addCompilerPass')
             ->with($this->isInstanceOf(BuildConsumptionExtensionsPass::class))
         ;
-        $container
-            ->expects($this->at(1))
-            ->method('addCompilerPass')
-            ->with($this->isInstanceOf(BuildClientRoutingPass::class))
-        ;
         $container
             ->expects($this->at(2))
             ->method('addCompilerPass')
@@ -62,11 +55,6 @@ public function testShouldRegisterExpectedCompilerPasses()
             ->method('addCompilerPass')
             ->with($this->isInstanceOf(BuildClientExtensionsPass::class))
         ;
-        $container
-            ->expects($this->at(6))
-            ->method('addCompilerPass')
-            ->with($this->isInstanceOf(BuildExclusiveCommandsExtensionPass::class))
-        ;
 
         $bundle = new EnqueueBundle();
         $bundle->build($container);