[client] migrate passes.

Author: makasim

pkg/enqueue-bundle/EnqueueBundle.php

@@ -32,7 +32,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new BuildClientTopicSubscriberRoutesPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
         $container->addCompilerPass(new BuildClientCommandSubscriberRoutesPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
         $container->addCompilerPass(new BuildClientProcessorRoutesPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
-        $container->addCompilerPass(new AnalyzeRouteCollectionPass('default'), PassConfig::TYPE_BEFORE_OPTIMIZATION, 30);
+        $container->addCompilerPass(new AnalyzeRouteCollectionPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 30);
         $container->addCompilerPass(new BuildClientProcessorRegistryPass());
 
         if (class_exists(AsyncEventDispatcherExtension::class)) {

pkg/enqueue/Symfony/Client/DependencyInjection/AnalyzeRouteCollectionPass.php

@@ -8,31 +8,35 @@
 
 final class AnalyzeRouteCollectionPass implements CompilerPassInterface
 {
-    /**
-     * @var string
-     */
-    private $name;
+    use FormatClientNameTrait;
 
-    public function __construct(string $clientName)
-    {
-        if (empty($clientName)) {
-            throw new \InvalidArgumentException('The name could not be empty.');
-        }
-
-        $this->name = $clientName;
-    }
+    protected $name;
 
     public function process(ContainerBuilder $container): void
     {
-        $routeCollectionId = sprintf('enqueue.client.%s.route_collection', $this->name);
-        if (false == $container->hasDefinition($routeCollectionId)) {
-            return;
+        if (false == $container->hasParameter('enqueue.clients')) {
+            throw new \LogicException('The "enqueue.clients" parameter must be set.');
         }
 
-        $collection = RouteCollection::fromArray($container->getDefinition($routeCollectionId)->getArgument(0));
+        $names = $container->getParameter('enqueue.clients');
+
+        foreach ($names as $name) {
+            $this->name = $name;
+            $routeCollectionId = $this->format('route_collection');
+            if (false == $container->hasDefinition($routeCollectionId)) {
+                throw new \LogicException(sprintf('Service "%s" not found', $routeCollectionId));
+            }
 
-        $this->exclusiveCommandsCouldNotBeRunOnDefaultQueue($collection);
-        $this->exclusiveCommandProcessorMustBeSingleOnGivenQueue($collection);
+            $collection = RouteCollection::fromArray($container->getDefinition($routeCollectionId)->getArgument(0));
+
+            $this->exclusiveCommandsCouldNotBeRunOnDefaultQueue($collection);
+            $this->exclusiveCommandProcessorMustBeSingleOnGivenQueue($collection);
+        }
+    }
+
+    protected function getName(): string
+    {
+        return $this->name;
     }
 
     private function exclusiveCommandsCouldNotBeRunOnDefaultQueue(RouteCollection $collection)

pkg/enqueue/Symfony/DependencyInjection/TransportFactory.php

@@ -182,7 +182,7 @@ public function buildQueueConsumer(ContainerBuilder $container, array $config):
             ->addArgument(new Reference($this->format('consumption_extensions')))
             ->addArgument([])
             ->addArgument(new Reference('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE))
-            ->addArgument($this->format('receive_timeout', true))
+            ->addArgument($this->parameter('receive_timeout'))
         ;
 
         $container->register($this->format('processor_registry'), ContainerProcessorRegistry::class);

pkg/enqueue/Tests/Symfony/Client/DependencyInjection/AnalyzeRouteCollectionPassTest.php

@@ -23,29 +23,36 @@ public function testShouldBeFinal()
         $this->assertClassFinal(AnalyzeRouteCollectionPass::class);
     }
 
-    public function testCouldBeConstructedWithName()
+    public function testCouldBeConstructedWithoutArguments()
     {
-        $pass = new AnalyzeRouteCollectionPass('aName');
-
-        $this->assertAttributeSame('aName', 'name', $pass);
+        new AnalyzeRouteCollectionPass();
     }
 
-    public function testThrowIfNameEmptyOnConstruct()
+    public function testThrowIfEnqueueClientsParameterNotSet()
     {
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The name could not be empty.');
-        new AnalyzeRouteCollectionPass('');
+        $pass = new AnalyzeRouteCollectionPass();
+
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('The "enqueue.clients" parameter must be set.');
+        $pass->process(new ContainerBuilder());
     }
 
-    public function testShouldDoNothingIfRouteCollectionServiceIsNotRegistered()
+    public function testThrowsIfNoRouteCollectionServiceFoundForConfiguredTransport()
     {
-        $pass = new AnalyzeRouteCollectionPass('aName');
-        $pass->process(new ContainerBuilder());
+        $container = new ContainerBuilder();
+        $container->setParameter('enqueue.clients', ['foo', 'bar']);
+
+        $pass = new AnalyzeRouteCollectionPass();
+
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Service "enqueue.client.foo.route_collection" not found');
+        $pass->process($container);
     }
 
     public function testThrowIfExclusiveCommandProcessorOnDefaultQueue()
     {
         $container = new ContainerBuilder();
+        $container->setParameter('enqueue.clients', ['aName']);
         $container->register('enqueue.client.aName.route_collection')->addArgument([
             (new Route(
                 'aCommand',
@@ -57,14 +64,15 @@ public function testThrowIfExclusiveCommandProcessorOnDefaultQueue()
 
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('The command "aCommand" processor "aBarProcessor" is exclusive but queue is not specified. Exclusive processors could not be run on a default queue.');
-        $pass = new AnalyzeRouteCollectionPass('aName');
+        $pass = new AnalyzeRouteCollectionPass();
 
         $pass->process($container);
     }
 
     public function testThrowIfTwoExclusiveCommandProcessorsWorkOnSamePrefixedQueue()
     {
         $container = new ContainerBuilder();
+        $container->setParameter('enqueue.clients', ['aName']);
         $container->register('enqueue.client.aName.route_collection')->addArgument([
             (new Route(
                 'aFooCommand',
@@ -83,14 +91,15 @@ public function testThrowIfTwoExclusiveCommandProcessorsWorkOnSamePrefixedQueue(
 
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('The command "aBarCommand" processor "aBarProcessor" is exclusive. The queue "aQueue" already has another exclusive command processor "aFooProcessor" bound to it.');
-        $pass = new AnalyzeRouteCollectionPass('aName');
+        $pass = new AnalyzeRouteCollectionPass();
 
         $pass->process($container);
     }
 
     public function testThrowIfTwoExclusiveCommandProcessorsWorkOnSameQueue()
     {
         $container = new ContainerBuilder();
+        $container->setParameter('enqueue.clients', ['aName']);
         $container->register('enqueue.client.aName.route_collection')->addArgument([
             (new Route(
                 'aFooCommand',
@@ -109,14 +118,15 @@ public function testThrowIfTwoExclusiveCommandProcessorsWorkOnSameQueue()
 
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('The command "aBarCommand" processor "aBarProcessor" is exclusive. The queue "aQueue" already has another exclusive command processor "aFooProcessor" bound to it.');
-        $pass = new AnalyzeRouteCollectionPass('aName');
+        $pass = new AnalyzeRouteCollectionPass();
 
         $pass->process($container);
     }
 
     public function testShouldNotThrowIfTwoExclusiveCommandProcessorsWorkOnQueueWithSameNameButOnePrefixed()
     {
         $container = new ContainerBuilder();
+        $container->setParameter('enqueue.clients', ['aName']);
         $container->register('enqueue.client.aName.route_collection')->addArgument([
             (new Route(
                 'aFooCommand',
@@ -133,7 +143,7 @@ public function testShouldNotThrowIfTwoExclusiveCommandProcessorsWorkOnQueueWith
             ))->toArray(),
         ]);
 
-        $pass = new AnalyzeRouteCollectionPass('aName');
+        $pass = new AnalyzeRouteCollectionPass();
 
         $pass->process($container);
     }