Skip to content

Symfony 4 compatibility #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Profiler/MessageQueueCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ public function getSentMessages()
return $this->data['sent_messages'];
}

/**
* {@inheritdoc}
*/
public function reset()
{
$this->data = [];
}

/**
* @param string $priority
*
Expand Down
19 changes: 19 additions & 0 deletions Resources/config/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ services:

Enqueue\Client\Producer:
class: 'Enqueue\Client\Producer'
public: true
arguments:
- '@enqueue.client.driver'
- '@enqueue.client.rpc_factory'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -182,6 +199,7 @@ services:

Enqueue\Symfony\Client\FlushSpoolProducerListener:
class: 'Enqueue\Symfony\Client\FlushSpoolProducerListener'
public: true
arguments:
- '@Enqueue\Client\SpoolProducer'
tags:
Expand All @@ -190,3 +208,4 @@ services:
# Deprecated. To be removed in 0.10.
enqueue.flush_spool_producer_listener:
alias: 'Enqueue\Symfony\Client\FlushSpoolProducerListener'
public: true
14 changes: 14 additions & 0 deletions Resources/config/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
services:
Enqueue\JobQueue\Doctrine\JobStorage:
class: 'Enqueue\JobQueue\Doctrine\JobStorage'
public: true
arguments:
- '@doctrine'
- 'Enqueue\JobQueue\Doctrine\Entity\Job'
Expand All @@ -12,37 +13,45 @@ 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'

# 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'
Expand All @@ -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'
Expand All @@ -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
6 changes: 6 additions & 0 deletions Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:

Enqueue\Consumption\QueueConsumer:
class: 'Enqueue\Consumption\QueueConsumer'
public: true
arguments:
- '@enqueue.transport.context'
- '@enqueue.consumption.extensions'
Expand All @@ -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:
Expand All @@ -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'
Expand All @@ -36,10 +40,12 @@ services:

Enqueue\Rpc\RpcClient:
class: 'Enqueue\Rpc\RpcClient'
public: true
arguments:
- '@enqueue.transport.context'
- '@enqueue.transport.rpc_factory'

# Deprecated. To be removed in 0.10.
enqueue.transport.rpc_client:
alias: 'Enqueue\Rpc\RpcClient'
public: true
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "MIT",
"require": {
"php": ">=5.6",
"symfony/framework-bundle": "^2.8|^3",
"symfony/framework-bundle": ">=2.8",
"enqueue/enqueue": "^0.8@dev",
"enqueue/null": "^0.8@dev",
"enqueue/async-event-dispatcher": "^0.8@dev"
Expand Down