[client] Move services definition to ClientFactory.

Author: makasim

pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php

@@ -42,6 +42,7 @@ public function load(array $configs, ContainerBuilder $container): void
             $loader->load('extensions/exclusive_command_extension.yml');
 
             $clientFactory = new ClientFactory('default');
+            $clientFactory->build($container, $config['client']);
             $clientFactory->createDriver($container, $config['transport']);
 
             $configDef = $container->getDefinition('enqueue.client.default.config');

pkg/enqueue-bundle/Resources/config/client.yml

@@ -1,83 +1,4 @@
 services:
-services:
-    enqueue.client.default.context:
-        class: 'Interop\Queue\Context'
-        factory: ['@enqueue.client.default.driver', 'getContext']
-
-    enqueue.client.default.driver_factory:
-        class: 'Enqueue\Client\DriverFactory'
-        arguments:
-            - '@enqueue.client.default.config'
-            - '@enqueue.client.default.route_collection'
-
-    enqueue.client.default.config:
-        class: 'Enqueue\Client\Config'
-
-    enqueue.client.default.route_collection:
-        class: 'Enqueue\Client\RouteCollection'
-        factory: ['Enqueue\Client\RouteCollection', 'fromArray']
-        arguments:
-            - []
-
-    enqueue.client.default.producer:
-        class: 'Enqueue\Client\Producer'
-        public: true
-        arguments:
-            - '@enqueue.client.default.driver'
-            - '@enqueue.client.default.rpc_factory'
-            - '@enqueue.client.default.client_extensions'
-
-    enqueue.client.default.spool_producer:
-        class: 'Enqueue\Client\SpoolProducer'
-        public: true
-        arguments:
-            - '@enqueue.client.default.producer'
-
-    enqueue.client.default.client_extensions:
-        class: 'Enqueue\Client\ChainExtension'
-        arguments:
-            - []
-
-    enqueue.client.default.rpc_factory:
-        class: 'Enqueue\Rpc\RpcFactory'
-        arguments:
-            - '@enqueue.client.default.context'
-
-    enqueue.client.default.router_processor:
-        class: 'Enqueue\Client\RouterProcessor'
-        arguments:
-            - '@enqueue.client.default.driver'
-
-    enqueue.client.default.processor_registry:
-        class: 'Enqueue\Symfony\ContainerProcessorRegistry'
-
-    enqueue.client.default.delegate_processor:
-        class: 'Enqueue\Client\DelegateProcessor'
-        arguments:
-            - '@enqueue.client.default.processor_registry'
-
-    enqueue.client.default.set_router_properties_extension:
-        class: 'Enqueue\Client\ConsumptionExtension\SetRouterPropertiesExtension'
-        arguments:
-            - '@enqueue.client.default.driver'
-        tags:
-            - { name: 'enqueue.consumption_extension', priority: 100, client: 'default' }
-
-    enqueue.client.default.queue_consumer:
-        class: 'Enqueue\Consumption\QueueConsumer'
-        arguments:
-            - '@enqueue.client.default.context'
-            - '@enqueue.client.default.consumption_extensions'
-            - []
-            - null
-            - ~
-            - ~
-
-    enqueue.client.default.consumption_extensions:
-        class: 'Enqueue\Consumption\ChainExtension'
-        arguments:
-            - []
-
     # todo
     enqueue.profiler.message_queue_collector:
         class: 'Enqueue\Bundle\Profiler\MessageQueueCollector'
@@ -86,17 +7,10 @@ services:
         tags:
             - { name: 'data_collector', template: '@Enqueue/Profiler/panel.html.twig', id: 'enqueue.message_queue' }
 
+    # todo
     enqueue.client.default.flush_spool_producer_listener:
         class: 'Enqueue\Symfony\Client\FlushSpoolProducerListener'
         arguments:
             - '@enqueue.client.default.spool_producer'
         tags:
             - { name: 'kernel.event_subscriber' }
-            
-    Enqueue\Client\ProducerInterface:
-        public: true
-        alias: 'enqueue.client.default.producer'
-        
-    Enqueue\Client\SpoolProducer:
-        public: true
-        alias: 'enqueue.client.default.spool_producer'

pkg/enqueue/Symfony/DependencyInjection/ClientFactory.php

@@ -2,15 +2,33 @@
 
 namespace Enqueue\Symfony\DependencyInjection;
 
+use Enqueue\Client\ChainExtension;
+use Enqueue\Client\Config;
+use Enqueue\Client\ConsumptionExtension\SetRouterPropertiesExtension;
+use Enqueue\Client\DelegateProcessor;
+use Enqueue\Client\DriverFactory;
 use Enqueue\Client\DriverInterface;
+use Enqueue\Client\Producer;
+use Enqueue\Client\ProducerInterface;
+use Enqueue\Client\RouteCollection;
+use Enqueue\Client\RouterProcessor;
+use Enqueue\Client\SpoolProducer;
+use Enqueue\Consumption\ChainExtension as ConsumptionChainExtension;
+use Enqueue\Consumption\QueueConsumer;
+use Enqueue\Rpc\RpcFactory;
+use Enqueue\Symfony\ContainerProcessorRegistry;
+use Interop\Queue\Context;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * @internal
  */
 final class ClientFactory
 {
+    use FormatClientNameTrait;
+
     /**
      * @var string
      */
@@ -25,6 +43,88 @@ public function __construct(string $name)
         $this->name = $name;
     }
 
+    public function build(ContainerBuilder $container, array $config): void
+    {
+        $container->register($this->format('context'), Context::class)
+            ->setFactory([$this->reference('driver'), 'getContext'])
+        ;
+
+        $container->register($this->format('driver_factory'), DriverFactory::class)
+            ->addArgument($this->reference('config'))
+            ->addArgument($this->reference('route_collection'))
+        ;
+
+        $container->register($this->format('config'), Config::class);
+
+        $container->register($this->format('route_collection'), RouteCollection::class)
+            ->addArgument([])
+            ->setFactory([RouteCollection::class, 'fromArray'])
+        ;
+
+        $container->register($this->format('producer'), Producer::class)
+            ->addArgument($this->reference('driver'))
+            ->addArgument($this->reference('rpc_factory'))
+            ->addArgument($this->reference('client_extensions'))
+        ;
+
+        $container->register($this->format('spool_producer'), SpoolProducer::class)
+            ->addArgument($this->reference('producer'))
+        ;
+
+        $container->register($this->format('client_extensions'), ChainExtension::class)
+            ->addArgument([])
+        ;
+
+        $container->register($this->format('rpc_factory'), RpcFactory::class)
+            ->addArgument($this->reference('context'))
+        ;
+
+        $container->register($this->format('router_processor'), RouterProcessor::class)
+            ->addArgument($this->reference('driver'))
+        ;
+
+        $container->register($this->format('processor_registry'), ContainerProcessorRegistry::class);
+
+        $container->register($this->format('delegate_processor'), DelegateProcessor::class)
+            ->addArgument($this->reference('processor_registry'))
+        ;
+
+        $container->register($this->format('set_router_properties_extension'), SetRouterPropertiesExtension::class)
+            ->addArgument($this->reference('driver'))
+            ->addTag('enqueue.consumption_extension', ['priority' => 100, 'client' => $this->name])
+        ;
+
+        $container->register($this->format('queue_consumer'), QueueConsumer::class)
+            ->addArgument($this->reference('context'))
+            ->addArgument($this->reference('consumption_extensions'))
+            ->addArgument([])
+            ->addArgument(null)
+            ->addArgument(null)
+            ->addArgument(null)
+        ;
+
+        $container->register($this->format('queue_consumer'), QueueConsumer::class)
+            ->addArgument($this->reference('context'))
+            ->addArgument($this->reference('consumption_extensions'))
+            ->addArgument([])
+            ->addArgument(new Reference('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE))
+        ;
+
+        $container->register($this->format('consumption_extensions'), ConsumptionChainExtension::class)
+            ->addArgument([])
+        ;
+
+        if ('default' === $this->name) {
+            $container->setAlias(ProducerInterface::class, $this->format('producer'))
+                ->setPublic(true)
+            ;
+
+            $container->setAlias(SpoolProducer::class, $this->format('spool_producer'))
+                ->setPublic(true)
+            ;
+        }
+    }
+
     public function createDriver(ContainerBuilder $container, array $config): string
     {
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());

pkg/enqueue/Symfony/DependencyInjection/FormatClientNameTrait.php

@@ -2,10 +2,24 @@
 
 namespace Enqueue\Symfony\DependencyInjection;
 
+use Symfony\Component\DependencyInjection\Reference;
+
 trait FormatClientNameTrait
 {
     abstract protected function getName(): string;
 
+    private function reference(string $serviceName): Reference
+    {
+        return new Reference($this->format($serviceName));
+    }
+
+    private function parameter(string $serviceName): string
+    {
+        $fullName = $this->format($serviceName, false);
+
+        return "%$fullName%";
+    }
+
     private function format(string $serviceName, $parameter = false): string
     {
         $pattern = 'enqueue.client.%s.'.$serviceName;

pkg/enqueue/Symfony/DependencyInjection/TransportFactory.php

@@ -16,6 +16,7 @@
 use Interop\Queue\Context;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -180,7 +181,7 @@ public function buildQueueConsumer(ContainerBuilder $container, array $config):
             ->addArgument(new Reference($contextId))
             ->addArgument(new Reference($this->format('consumption_extensions')))
             ->addArgument([])
-            ->addArgument(null)
+            ->addArgument(new Reference('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE))
             ->addArgument($this->format('receive_timeout', true))
         ;