From ab82064db181fa71ea899982b2cca352920a4446 Mon Sep 17 00:00:00 2001 From: Igor Date: Sat, 18 Nov 2017 20:50:16 +0200 Subject: [PATCH 1/3] add compatibility with symfony 4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a3b69ee..7216b63 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": ">=5.6", - "symfony/framework-bundle": "^2.8|^3", + "symfony/framework-bundle": "^2.8|^3|^4", "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "enqueue/async-event-dispatcher": "^0.8@dev" From 5c0ed54422188c4c5f92da82d255d194eeafe0f9 Mon Sep 17 00:00:00 2001 From: Igor Date: Sat, 18 Nov 2017 22:14:58 +0200 Subject: [PATCH 2/3] change symfony/framework-bundle bundle version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7216b63..704745a 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": ">=5.6", - "symfony/framework-bundle": "^2.8|^3|^4", + "symfony/framework-bundle": ">=2.8", "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "enqueue/async-event-dispatcher": "^0.8@dev" From 199f301b43be974beac540405c9660b437c390c2 Mon Sep 17 00:00:00 2001 From: Igor Drozd Date: Sun, 19 Nov 2017 20:10:07 +0200 Subject: [PATCH 3/3] add public true to services and aliases --- Profiler/MessageQueueCollector.php | 8 ++++++++ Resources/config/client.yml | 19 +++++++++++++++++++ Resources/config/job.yml | 14 ++++++++++++++ Resources/config/services.yml | 6 ++++++ 4 files changed, 47 insertions(+) diff --git a/Profiler/MessageQueueCollector.php b/Profiler/MessageQueueCollector.php index b3e2b5f..b83bec0 100644 --- a/Profiler/MessageQueueCollector.php +++ b/Profiler/MessageQueueCollector.php @@ -47,6 +47,14 @@ public function getSentMessages() return $this->data['sent_messages']; } + /** + * {@inheritdoc} + */ + public function reset() + { + $this->data = []; + } + /** * @param string $priority * diff --git a/Resources/config/client.yml b/Resources/config/client.yml index 539abfc..2183a3b 100644 --- a/Resources/config/client.yml +++ b/Resources/config/client.yml @@ -5,6 +5,7 @@ services: Enqueue\Client\Producer: class: 'Enqueue\Client\Producer' + public: true arguments: - '@enqueue.client.driver' - '@enqueue.client.rpc_factory' @@ -13,27 +14,33 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.producer: alias: 'Enqueue\Client\Producer' + public: true # Deprecated. To be removed in 0.10. enqueue.producer: alias: 'enqueue.client.producer' + public: true # Deprecated. To be removed in 0.10. enqueue.client.producer_v2: alias: 'enqueue.client.producer' + public: true Enqueue\Client\SpoolProducer: class: 'Enqueue\Client\SpoolProducer' + public: true arguments: - '@Enqueue\Client\Producer' # Deprecated. To be removed in 0.10. enqueue.client.spool_producer: alias: 'Enqueue\Client\SpoolProducer' + public: true # Deprecated. To be removed in 0.10. enqueue.spool_producer: alias: 'enqueue.client.spool_producer' + public: true enqueue.client.extensions: class: 'Enqueue\Client\ChainExtension' @@ -63,6 +70,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.router_processor: alias: 'Enqueue\Client\RouterProcessor' + public: true enqueue.client.processor_registry: class: 'Enqueue\Symfony\Client\ContainerAwareProcessorRegistry' @@ -78,6 +86,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.meta.topic_meta_registry: alias: 'Enqueue\Client\Meta\TopicMetaRegistry' + public: true Enqueue\Client\Meta\QueueMetaRegistry: class: 'Enqueue\Client\Meta\QueueMetaRegistry' @@ -87,6 +96,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.meta.queue_meta_registry: alias: 'Enqueue\Client\Meta\QueueMetaRegistry' + public: true enqueue.client.delegate_processor: class: 'Enqueue\Client\DelegateProcessor' @@ -125,6 +135,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.consume_messages_command: alias: 'Enqueue\Symfony\Client\ConsumeMessagesCommand' + public: true Enqueue\Symfony\Client\ProduceMessageCommand: class: 'Enqueue\Symfony\Client\ProduceMessageCommand' @@ -137,9 +148,11 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.produce_message_command: alias: 'Enqueue\Symfony\Client\ProduceMessageCommand' + public: true Enqueue\Symfony\Client\Meta\TopicsCommand: class: 'Enqueue\Symfony\Client\Meta\TopicsCommand' + public: true arguments: - '@Enqueue\Client\Meta\TopicMetaRegistry' tags: @@ -148,9 +161,11 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.meta.topics_command: alias: 'Enqueue\Symfony\Client\Meta\TopicsCommand' + public: true Enqueue\Symfony\Client\Meta\QueuesCommand: class: 'Enqueue\Symfony\Client\Meta\QueuesCommand' + public: true arguments: - '@Enqueue\Client\Meta\QueueMetaRegistry' tags: @@ -159,6 +174,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.meta.queues_command: alias: 'Enqueue\Symfony\Client\Meta\QueuesCommand' + public: true Enqueue\Symfony\Client\SetupBrokerCommand: class: 'Enqueue\Symfony\Client\SetupBrokerCommand' @@ -171,6 +187,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.client.setup_broker_command: alias: 'Enqueue\Symfony\Client\SetupBrokerCommand' + public: true enqueue.profiler.message_queue_collector: class: 'Enqueue\Bundle\Profiler\MessageQueueCollector' @@ -182,6 +199,7 @@ services: Enqueue\Symfony\Client\FlushSpoolProducerListener: class: 'Enqueue\Symfony\Client\FlushSpoolProducerListener' + public: true arguments: - '@Enqueue\Client\SpoolProducer' tags: @@ -190,3 +208,4 @@ services: # Deprecated. To be removed in 0.10. enqueue.flush_spool_producer_listener: alias: 'Enqueue\Symfony\Client\FlushSpoolProducerListener' + public: true diff --git a/Resources/config/job.yml b/Resources/config/job.yml index d8db707..d573828 100644 --- a/Resources/config/job.yml +++ b/Resources/config/job.yml @@ -4,6 +4,7 @@ parameters: services: Enqueue\JobQueue\Doctrine\JobStorage: class: 'Enqueue\JobQueue\Doctrine\JobStorage' + public: true arguments: - '@doctrine' - 'Enqueue\JobQueue\Doctrine\Entity\Job' @@ -12,9 +13,11 @@ services: # Deprecated. To be removed in 0.10. enqueue.job.storage: alias: 'Enqueue\JobQueue\Doctrine\JobStorage' + public: true Enqueue\JobQueue\JobProcessor: class: 'Enqueue\JobQueue\JobProcessor' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' - '@Enqueue\Client\Producer' @@ -22,27 +25,33 @@ services: # Deprecated. To be removed in 0.10. enqueue.job.processor: alias: 'Enqueue\JobQueue\JobProcessor' + public: true Enqueue\JobQueue\JobRunner: class: 'Enqueue\JobQueue\JobRunner' + public: true arguments: - '@Enqueue\JobQueue\JobProcessor' # Deprecated. To be removed in 0.10. enqueue.job.runner: alias: 'Enqueue\JobQueue\JobRunner' + public: true Enqueue\JobQueue\CalculateRootJobStatusService: class: 'Enqueue\JobQueue\CalculateRootJobStatusService' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' # Deprecated. To be removed in 0.10. enqueue.job.calculate_root_job_status_service: alias: 'Enqueue\JobQueue\CalculateRootJobStatusService' + public: true Enqueue\JobQueue\CalculateRootJobStatusProcessor: class: 'Enqueue\JobQueue\CalculateRootJobStatusProcessor' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' - '@Enqueue\JobQueue\CalculateRootJobStatusService' @@ -54,9 +63,11 @@ services: # Deprecated. To be removed in 0.10. enqueue.job.calculate_root_job_status_processor: alias: 'Enqueue\JobQueue\CalculateRootJobStatusProcessor' + public: true Enqueue\JobQueue\DependentJobProcessor: class: 'Enqueue\JobQueue\DependentJobProcessor' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' - '@Enqueue\Client\Producer' @@ -67,12 +78,15 @@ services: # Deprecated. To be removed in 0.10. enqueue.job.dependent_job_processor: alias: 'Enqueue\JobQueue\DependentJobProcessor' + public: true Enqueue\JobQueue\DependentJobService: class: 'Enqueue\JobQueue\DependentJobService' + public: true arguments: - '@Enqueue\JobQueue\Doctrine\JobStorage' # Deprecated. To be removed in 0.10. enqueue.job.dependent_job_service: alias: 'Enqueue\JobQueue\DependentJobService' + public: true diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 21a58df..f7bbcc9 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -7,6 +7,7 @@ services: Enqueue\Consumption\QueueConsumer: class: 'Enqueue\Consumption\QueueConsumer' + public: true arguments: - '@enqueue.transport.context' - '@enqueue.consumption.extensions' @@ -16,9 +17,11 @@ services: # Deprecated. To be removed in 0.10. enqueue.consumption.queue_consumer: alias: 'Enqueue\Consumption\QueueConsumer' + public: true Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand: class: 'Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand' + public: true arguments: - '@Enqueue\Consumption\QueueConsumer' tags: @@ -27,6 +30,7 @@ services: # Deprecated. To be removed in 0.10. enqueue.command.consume_messages: alias: 'Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand' + public: true enqueue.transport.rpc_factory: class: 'Enqueue\Rpc\RpcFactory' @@ -36,6 +40,7 @@ services: Enqueue\Rpc\RpcClient: class: 'Enqueue\Rpc\RpcClient' + public: true arguments: - '@enqueue.transport.context' - '@enqueue.transport.rpc_factory' @@ -43,3 +48,4 @@ services: # Deprecated. To be removed in 0.10. enqueue.transport.rpc_client: alias: 'Enqueue\Rpc\RpcClient' + public: true