Merge pull request #242 from Lctrs/service-alias

[bundle] Renamed exposed services' name to classes' FQCN

Author: makasim

Diff for: pkg/enqueue-bundle/DependencyInjection/Compiler/AddTopicMetaPass.php

@@ -2,6 +2,7 @@
 
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
+use Enqueue\Client\Meta\TopicMetaRegistry;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -44,7 +45,7 @@ public function add($topicName, $topicDescription = '', array $topicSubscribers
      */
     public function process(ContainerBuilder $container)
     {
-        $metaRegistryId = 'enqueue.client.meta.topic_meta_registry';
+        $metaRegistryId = TopicMetaRegistry::class;
 
         if (false == $container->hasDefinition($metaRegistryId)) {
             return;

Diff for: pkg/enqueue-bundle/DependencyInjection/Compiler/BuildClientRoutingPass.php

@@ -3,6 +3,7 @@
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
 use Enqueue\Client\Config;
+use Enqueue\Client\RouterProcessor;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -16,7 +17,7 @@ class BuildClientRoutingPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         $processorTagName = 'enqueue.client.processor';
-        $routerId = 'enqueue.client.router_processor';
+        $routerId = RouterProcessor::class;
 
         if (false == $container->hasDefinition($routerId)) {
             return;

Diff for: pkg/enqueue-bundle/DependencyInjection/Compiler/BuildQueueMetaRegistryPass.php

@@ -2,6 +2,7 @@
 
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
+use Enqueue\Client\Meta\QueueMetaRegistry;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -15,7 +16,7 @@ class BuildQueueMetaRegistryPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         $processorTagName = 'enqueue.client.processor';
-        $queueMetaRegistryId = 'enqueue.client.meta.queue_meta_registry';
+        $queueMetaRegistryId = QueueMetaRegistry::class;
         if (false == $container->hasDefinition($queueMetaRegistryId)) {
             return;
         }

Diff for: pkg/enqueue-bundle/DependencyInjection/Compiler/BuildTopicMetaSubscribersPass.php

@@ -2,6 +2,7 @@
 
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
+use Enqueue\Client\Meta\TopicMetaRegistry;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -16,7 +17,7 @@ public function process(ContainerBuilder $container)
     {
         $processorTagName = 'enqueue.client.processor';
 
-        if (false == $container->hasDefinition('enqueue.client.meta.topic_meta_registry')) {
+        if (false == $container->hasDefinition(TopicMetaRegistry::class)) {
             return;
         }
 

Diff for: pkg/enqueue-bundle/DependencyInjection/Configuration.php

@@ -3,6 +3,7 @@
 namespace Enqueue\Bundle\DependencyInjection;
 
 use Enqueue\Client\Config;
+use Enqueue\Client\RouterProcessor;
 use Enqueue\Symfony\TransportFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -46,7 +47,7 @@ public function getConfigTreeBuilder()
                 ->scalarNode('app_name')->defaultValue('app')->end()
                 ->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->scalarNode('router_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
-                ->scalarNode('router_processor')->defaultValue('enqueue.client.router_processor')->end()
+                ->scalarNode('router_processor')->defaultValue(RouterProcessor::class)->end()
                 ->scalarNode('default_processor_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->integerNode('redelivered_delay_time')->min(0)->defaultValue(0)->end()
             ->end()->end()

Diff for: pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php

@@ -3,7 +3,9 @@
 namespace Enqueue\Bundle\DependencyInjection;
 
 use Enqueue\AsyncEventDispatcher\DependencyInjection\AsyncEventDispatcherExtension;
+use Enqueue\Client\Producer;
 use Enqueue\Client\TraceableProducer;
+use Enqueue\Consumption\QueueConsumer;
 use Enqueue\JobQueue\Job;
 use Enqueue\Null\Symfony\NullTransportFactory;
 use Enqueue\Symfony\DefaultTransportFactory;
@@ -94,10 +96,9 @@ public function load(array $configs, ContainerBuilder $container)
             $container->setParameter('enqueue.client.default_queue_name', $config['client']['default_processor_queue']);
 
             if (false == empty($config['client']['traceable_producer'])) {
-                $producerId = 'enqueue.client.traceable_producer';
-                $container->register($producerId, TraceableProducer::class)
-                    ->setDecoratedService('enqueue.client.producer')
-                    ->addArgument(new Reference('enqueue.client.traceable_producer.inner'))
+                $container->register(TraceableProducer::class, TraceableProducer::class)
+                    ->setDecoratedService(Producer::class)
+                    ->addArgument(new Reference(sprintf('%s.inner', TraceableProducer::class)))
                 ;
             }
 
@@ -111,7 +112,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         // configure queue consumer
-        $container->getDefinition('enqueue.consumption.queue_consumer')
+        $container->getDefinition(QueueConsumer::class)
             ->replaceArgument(2, $config['consumption']['idle_timeout'])
             ->replaceArgument(3, $config['consumption']['receive_timeout'])
         ;

Diff for: pkg/enqueue-bundle/Resources/config/client.yml

@@ -3,40 +3,51 @@ services:
         class: 'Enqueue\Client\Config'
         public: false
 
-    enqueue.client.producer:
+    Enqueue\Client\Producer:
         class: 'Enqueue\Client\Producer'
         arguments:
             - '@enqueue.client.driver'
             - '@enqueue.client.rpc_factory'
             - '@enqueue.client.extensions'
 
-    enqueue.client.spool_producer:
-        class: 'Enqueue\Client\SpoolProducer'
-        arguments:
-            - '@enqueue.client.producer'
-
-    enqueue.client.extensions:
-        class: 'Enqueue\Client\ChainExtension'
-        public: false
-        arguments:
-            - []
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.producer:
+        alias: 'Enqueue\Client\Producer'
 
+    # Deprecated. To be removed in 0.10.
     enqueue.producer:
         alias: 'enqueue.client.producer'
 
+    # Deprecated. To be removed in 0.10.
     enqueue.client.producer_v2:
         alias: 'enqueue.client.producer'
 
+    Enqueue\Client\SpoolProducer:
+        class: 'Enqueue\Client\SpoolProducer'
+        arguments:
+            - '@Enqueue\Client\Producer'
+
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.spool_producer:
+        alias: 'Enqueue\Client\SpoolProducer'
+
+    # Deprecated. To be removed in 0.10.
     enqueue.spool_producer:
         alias: 'enqueue.client.spool_producer'
 
+    enqueue.client.extensions:
+        class: 'Enqueue\Client\ChainExtension'
+        public: false
+        arguments:
+            - []
+
     enqueue.client.rpc_factory:
         class: 'Enqueue\Rpc\RpcFactory'
         public: false
         arguments:
             - '@enqueue.transport.context'
 
-    enqueue.client.router_processor:
+    Enqueue\Client\RouterProcessor:
         class: 'Enqueue\Client\RouterProcessor'
         public: true
         arguments:
@@ -49,22 +60,34 @@ services:
                 topicName: '__router__'
                 queueName: '%enqueue.client.router_queue_name%'
 
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.router_processor:
+        alias: 'Enqueue\Client\RouterProcessor'
+
     enqueue.client.processor_registry:
         class: 'Enqueue\Symfony\Client\ContainerAwareProcessorRegistry'
         public: false
         calls:
             - ['setContainer', ['@service_container']]
 
-    enqueue.client.meta.topic_meta_registry:
+    Enqueue\Client\Meta\TopicMetaRegistry:
         class: 'Enqueue\Client\Meta\TopicMetaRegistry'
         public: true
         arguments: [[]]
 
-    enqueue.client.meta.queue_meta_registry:
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.meta.topic_meta_registry:
+        alias: 'Enqueue\Client\Meta\TopicMetaRegistry'
+
+    Enqueue\Client\Meta\QueueMetaRegistry:
         class: 'Enqueue\Client\Meta\QueueMetaRegistry'
         public: true
         arguments: ['@enqueue.client.config', []]
 
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.meta.queue_meta_registry:
+        alias: 'Enqueue\Client\Meta\QueueMetaRegistry'
+
     enqueue.client.delegate_processor:
         class: 'Enqueue\Client\DelegateProcessor'
         public: false
@@ -88,60 +111,82 @@ services:
             - ~
             - ~
 
-    enqueue.client.consume_messages_command:
+    Enqueue\Symfony\Client\ConsumeMessagesCommand:
         class: 'Enqueue\Symfony\Client\ConsumeMessagesCommand'
         public: true
         arguments:
             - '@enqueue.client.queue_consumer'
             - '@enqueue.client.delegate_processor'
-            - '@enqueue.client.meta.queue_meta_registry'
+            - '@Enqueue\Client\Meta\QueueMetaRegistry'
             - '@enqueue.client.driver'
         tags:
             - { name: 'console.command' }
 
-    enqueue.client.produce_message_command:
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.consume_messages_command:
+        alias: 'Enqueue\Symfony\Client\ConsumeMessagesCommand'
+
+    Enqueue\Symfony\Client\ProduceMessageCommand:
         class: 'Enqueue\Symfony\Client\ProduceMessageCommand'
         public: true
         arguments:
-            - '@enqueue.client.producer'
+            - '@Enqueue\Client\Producer'
         tags:
             - { name: 'console.command' }
 
-    enqueue.client.meta.topics_command:
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.produce_message_command:
+        alias: 'Enqueue\Symfony\Client\ProduceMessageCommand'
+
+    Enqueue\Symfony\Client\Meta\TopicsCommand:
         class: 'Enqueue\Symfony\Client\Meta\TopicsCommand'
         arguments:
-            - '@enqueue.client.meta.topic_meta_registry'
+            - '@Enqueue\Client\Meta\TopicMetaRegistry'
         tags:
             - { name: 'console.command' }
 
-    enqueue.client.meta.queues_command:
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.meta.topics_command:
+        alias: 'Enqueue\Symfony\Client\Meta\TopicsCommand'
+
+    Enqueue\Symfony\Client\Meta\QueuesCommand:
         class: 'Enqueue\Symfony\Client\Meta\QueuesCommand'
         arguments:
-            - '@enqueue.client.meta.queue_meta_registry'
+            - '@Enqueue\Client\Meta\QueueMetaRegistry'
         tags:
             - { name: 'console.command' }
 
-    enqueue.client.setup_broker_command:
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.meta.queues_command:
+        alias: 'Enqueue\Symfony\Client\Meta\QueuesCommand'
+
+    Enqueue\Symfony\Client\SetupBrokerCommand:
         class: 'Enqueue\Symfony\Client\SetupBrokerCommand'
         public: true
         arguments:
             - '@enqueue.client.driver'
         tags:
             - { name: 'console.command' }
 
+    # Deprecated. To be removed in 0.10.
+    enqueue.client.setup_broker_command:
+        alias: 'Enqueue\Symfony\Client\SetupBrokerCommand'
+
     enqueue.profiler.message_queue_collector:
         class: 'Enqueue\Bundle\Profiler\MessageQueueCollector'
         public: false
-        arguments: ['@enqueue.client.producer']
+        arguments:
+            - '@Enqueue\Client\Producer'
         tags:
-            -
-              name: 'data_collector'
-              template: '@Enqueue/Profiler/panel.html.twig'
-              id: 'enqueue.message_queue'
+            - { name: 'data_collector', template: '@Enqueue/Profiler/panel.html.twig', id: 'enqueue.message_queue' }
 
-    enqueue.flush_spool_producer_listener:
+    Enqueue\Symfony\Client\FlushSpoolProducerListener:
         class: 'Enqueue\Symfony\Client\FlushSpoolProducerListener'
         arguments:
-            - '@enqueue.client.spool_producer'
+            - '@Enqueue\Client\SpoolProducer'
         tags:
             - { name: 'kernel.event_subscriber' }
+
+    # Deprecated. To be removed in 0.10.
+    enqueue.flush_spool_producer_listener:
+        alias: 'Enqueue\Symfony\Client\FlushSpoolProducerListener'

Diff for: pkg/enqueue-bundle/Resources/config/extensions/flush_spool_producer_extension.yml

@@ -3,6 +3,6 @@ services:
         class: 'Enqueue\Client\ConsumptionExtension\FlushSpoolProducerExtension'
         public: false
         arguments:
-            - '@enqueue.client.spool_producer'
+            - '@Enqueue\Client\SpoolProducer'
         tags:
             - { name: 'enqueue.consumption.extension', priority: -100 }