Skip to content

Commit c6fd5b1

Browse files
makasimmakasim
authored
Merge pull request #269 from php-enqueue/sf4
Add Symfony4 support
2 parents b86d7ef + acac282 commit c6fd5b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+345
-205
lines changed

Diff for: ‎.travis.yml

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ matrix:
1919
env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
2020
- php: 7.0
2121
env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
22+
- php: 7.1
23+
env: SYMFONY_VERSION=v4.0.0-BETA4 UNIT_TESTS=true
2224
- php: 7.1
2325
services: docker
2426
env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
@@ -31,6 +33,9 @@ matrix:
3133
- php: 7.1
3234
services: docker
3335
env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
36+
- php: 7.1
37+
services: docker
38+
env: SYMFONY_VERSION=v4.0.0-BETA4 FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
3439
- php: 7.1
3540
services: docker
3641
env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true

Diff for: ‎composer.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "enqueue/enqueue-dev",
33
"type": "project",
4-
"minimum-stability": "stable",
4+
"minimum-stability": "beta",
55
"homepage": "https://github.com/php-enqueue/enqueue-dev",
66
"require": {
77
"php": ">=5.6",
@@ -34,13 +34,14 @@
3434
"phpunit/phpunit": "^5",
3535
"doctrine/doctrine-bundle": "~1.2",
3636
"predis/predis": "^1.1",
37-
"symfony/monolog-bundle": "^2.8|^3",
38-
"symfony/browser-kit": "^2.8|^3",
39-
"symfony/expression-language": "^2.8|^3",
40-
"symfony/event-dispatcher": "^2.8|^3",
41-
"symfony/console": "^2.8|^3",
37+
"symfony/monolog-bundle": "^2.8|^3|^4",
38+
"symfony/browser-kit": "^2.8|^3|^4",
39+
"symfony/expression-language": "^2.8|^3|^4",
40+
"symfony/event-dispatcher": "^2.8|^3|^4",
41+
"symfony/console": "^2.8|^3|^4",
4242
"friendsofphp/php-cs-fixer": "^2",
43-
"empi89/php-amqp-stubs": "*@dev"
43+
"empi89/php-amqp-stubs": "*@dev",
44+
"php-http/client-common": "^1.7@dev"
4445
},
4546
"autoload": {
4647
"files": [

Diff for: ‎docker-compose.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ services:
1919
- AMQP_DSN=amqp://guest:guest@rabbitmq:5672/mqdev
2020
- AMQPS_DSN=amqps://guest:guest@rabbitmqssl:5671
2121
- DOCTINE_DSN=mysql://root:rootpass@mysql/mqdev
22-
- SYMFONY__RABBITMQ__HOST=rabbitmq
23-
- SYMFONY__RABBITMQ__USER=guest
24-
- SYMFONY__RABBITMQ__PASSWORD=guest
25-
- SYMFONY__RABBITMQ__VHOST=mqdev
26-
- SYMFONY__RABBITMQ__AMQP__PORT=5672
27-
- SYMFONY__RABBITMQ__STOMP__PORT=61613
28-
- SYMFONY__DB__DRIVER=pdo_mysql
29-
- SYMFONY__DB__HOST=mysql
30-
- SYMFONY__DB__PORT=3306
31-
- SYMFONY__DB__NAME=mqdev
32-
- SYMFONY__DB__USER=root
33-
- SYMFONY__DB__PASSWORD=rootpass
34-
- SYMFONY__REDIS__HOST=redis
35-
- SYMFONY__REDIS__PORT=6379
36-
- AWS__SQS__KEY=$ENQUEUE_AWS__SQS__KEY
37-
- AWS__SQS__SECRET=$ENQUEUE_AWS__SQS__SECRET
38-
- AWS__SQS__REGION=$ENQUEUE_AWS__SQS__REGION
22+
- RABBITMQ_HOST=rabbitmq
23+
- RABBITMQ_USER=guest
24+
- RABBITMQ_PASSWORD=guest
25+
- RABBITMQ_VHOST=mqdev
26+
- RABBITMQ_AMQP__PORT=5672
27+
- RABBITMQ_STOMP_PORT=61613
28+
- DOCTRINE_DRIVER=pdo_mysql
29+
- DOCTRINE_HOST=mysql
30+
- DOCTRINE_PORT=3306
31+
- DOCTRINE_DB_NAME=mqdev
32+
- DOCTRINE_USER=root
33+
- DOCTRINE_PASSWORD=rootpass
34+
- REDIS_HOST=redis
35+
- REDIS_PORT=6379
36+
- AWS_SQS_KEY=$ENQUEUE_AWS__SQS__KEY
37+
- AWS_SQS_SECRET=$ENQUEUE_AWS__SQS__SECRET
38+
- AWS_SQS_REGION=$ENQUEUE_AWS__SQS__REGION
3939
- BEANSTALKD_HOST=beanstalkd
4040
- BEANSTALKD_PORT=11300
4141
- BEANSTALKD_DSN=beanstalk://beanstalkd:11300

Diff for: ‎pkg/amqp-bunny/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"enqueue/enqueue": "^0.8@dev",
1919
"enqueue/null": "^0.8@dev",
2020
"queue-interop/queue-spec": "^0.5.3@dev",
21-
"symfony/dependency-injection": "^2.8|^3",
22-
"symfony/config": "^2.8|^3"
21+
"symfony/dependency-injection": "^2.8|^3|^4",
22+
"symfony/config": "^2.8|^3|^4"
2323
},
2424
"autoload": {
2525
"psr-4": { "Enqueue\\AmqpBunny\\": "" },

Diff for: ‎pkg/amqp-ext/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"enqueue/null": "^0.8@dev",
2020
"queue-interop/queue-spec": "^0.5.3@dev",
2121
"empi89/php-amqp-stubs": "*@dev",
22-
"symfony/dependency-injection": "^2.8|^3",
23-
"symfony/config": "^2.8|^3"
22+
"symfony/dependency-injection": "^2.8|^3|^4",
23+
"symfony/config": "^2.8|^3|^4"
2424
},
2525
"autoload": {
2626
"psr-4": { "Enqueue\\AmqpExt\\": "" },

Diff for: ‎pkg/amqp-ext/examples/consume.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
use Enqueue\AmqpExt\AmqpConnectionFactory;
1919

2020
$config = [
21-
'host' => getenv('SYMFONY__RABBITMQ__HOST'),
22-
'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
23-
'user' => getenv('SYMFONY__RABBITMQ__USER'),
24-
'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
25-
'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
21+
'host' => getenv('RABBITMQ_HOST'),
22+
'port' => getenv('RABBITMQ_AMQP__PORT'),
23+
'user' => getenv('RABBITMQ_USER'),
24+
'pass' => getenv('RABBITMQ_PASSWORD'),
25+
'vhost' => getenv('RABBITMQ_VHOST'),
2626
];
2727

2828
$factory = new AmqpConnectionFactory($config);

Diff for: ‎pkg/amqp-ext/examples/produce.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
use Interop\Amqp\Impl\AmqpBind;
2222

2323
$config = [
24-
'host' => getenv('SYMFONY__RABBITMQ__HOST'),
25-
'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
26-
'user' => getenv('SYMFONY__RABBITMQ__USER'),
27-
'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
28-
'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
24+
'host' => getenv('RABBITMQ_HOST'),
25+
'port' => getenv('RABBITMQ_AMQP__PORT'),
26+
'user' => getenv('RABBITMQ_USER'),
27+
'pass' => getenv('RABBITMQ_PASSWORD'),
28+
'vhost' => getenv('RABBITMQ_VHOST'),
2929
];
3030

3131
$factory = new AmqpConnectionFactory($config);

Diff for: ‎pkg/amqp-lib/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"enqueue/enqueue": "^0.8@dev",
1919
"enqueue/null": "^0.8@dev",
2020
"queue-interop/queue-spec": "^0.5.3@dev",
21-
"symfony/dependency-injection": "^2.8|^3",
22-
"symfony/config": "^2.8|^3"
21+
"symfony/dependency-injection": "^2.8|^3|^4",
22+
"symfony/config": "^2.8|^3|^4"
2323
},
2424
"autoload": {
2525
"psr-4": { "Enqueue\\AmqpLib\\": "" },

Diff for: ‎pkg/amqp-lib/examples/consume.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
use Enqueue\AmqpLib\AmqpConnectionFactory;
1919

2020
$config = [
21-
'host' => getenv('SYMFONY__RABBITMQ__HOST'),
22-
'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
23-
'user' => getenv('SYMFONY__RABBITMQ__USER'),
24-
'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
25-
'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
21+
'host' => getenv('RABBITMQ_HOST'),
22+
'port' => getenv('RABBITMQ_AMQP__PORT'),
23+
'user' => getenv('RABBITMQ_USER'),
24+
'pass' => getenv('RABBITMQ_PASSWORD'),
25+
'vhost' => getenv('RABBITMQ_VHOST'),
2626
'receive_method' => 'basic_consume',
2727
];
2828

Diff for: ‎pkg/amqp-lib/examples/produce.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
use Interop\Amqp\Impl\AmqpBind;
2222

2323
$config = [
24-
'host' => getenv('SYMFONY__RABBITMQ__HOST'),
25-
'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
26-
'user' => getenv('SYMFONY__RABBITMQ__USER'),
27-
'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
28-
'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
24+
'host' => getenv('RABBITMQ_HOST'),
25+
'port' => getenv('RABBITMQ_AMQP__PORT'),
26+
'user' => getenv('RABBITMQ_USER'),
27+
'pass' => getenv('RABBITMQ_PASSWORD'),
28+
'vhost' => getenv('RABBITMQ_VHOST'),
2929
];
3030

3131
$factory = new AmqpConnectionFactory($config);

Diff for: ‎pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\AsyncEventDispatcher\OldAsyncEventDispatcher;
66
use Symfony\Component\Config\FileLocator;
7+
use Symfony\Component\DependencyInjection\Alias;
78
use Symfony\Component\DependencyInjection\ContainerBuilder;
89
use Symfony\Component\DependencyInjection\Definition;
910
use Symfony\Component\DependencyInjection\Extension\Extension;
@@ -20,7 +21,7 @@ public function load(array $configs, ContainerBuilder $container)
2021
{
2122
$config = $this->processConfiguration(new Configuration(), $configs);
2223

23-
$container->setAlias('enqueue.events.context', $config['context_service']);
24+
$container->setAlias('enqueue.events.context', new Alias($config['context_service'], true));
2425

2526
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
2627
$loader->load('services.yml');

Diff for: ‎pkg/async-event-dispatcher/Resources/config/services.yml

+4
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,20 @@ services:
1414

1515
enqueue.events.async_listener:
1616
class: 'Enqueue\AsyncEventDispatcher\AsyncListener'
17+
public: public
1718
arguments: ['@enqueue.events.context', '@enqueue.events.registry', '%enqueue_events_queue%']
1819

1920

2021
enqueue.events.event_dispatcher:
2122
class: 'Enqueue\AsyncEventDispatcher\AsyncEventDispatcher'
23+
public: public
2224
arguments:
2325
- '@event_dispatcher'
2426
- '@enqueue.events.async_listener'
2527

2628
enqueue.events.async_processor:
2729
class: 'Enqueue\AsyncEventDispatcher\AsyncProcessor'
30+
public: public
2831
arguments:
2932
- '@enqueue.events.registry'
3033
- '@enqueue.events.event_dispatcher'
@@ -39,6 +42,7 @@ services:
3942

4043
enqueue.events.php_serializer_event_transofrmer:
4144
class: 'Enqueue\AsyncEventDispatcher\PhpSerializerEventTransformer'
45+
public: public
4246
arguments:
4347
- '@enqueue.events.context'
4448
tags:

Diff for: ‎pkg/async-event-dispatcher/composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
"require": {
99
"php": ">=5.6",
1010
"enqueue/enqueue": "^0.8@dev",
11-
"symfony/event-dispatcher": "^2.8|^3"
11+
"symfony/event-dispatcher": "^2.8|^3|^4"
1212
},
1313
"require-dev": {
1414
"phpunit/phpunit": "~5.5",
15-
"symfony/dependency-injection": "^2.8|^3",
16-
"symfony/config": "^2.8|^3",
17-
"symfony/http-kernel": "^2.8|^3",
18-
"symfony/filesystem": "^2.8|^3",
15+
"symfony/dependency-injection": "^2.8|^3|^4",
16+
"symfony/config": "^2.8|^3|^4",
17+
"symfony/http-kernel": "^2.8|^3|^4",
18+
"symfony/filesystem": "^2.8|^3|^4",
1919
"enqueue/null": "^0.8@dev",
2020
"enqueue/fs": "^0.8@dev",
2121
"enqueue/test": "^0.8@dev"
2222
},
2323
"suggest": {
24-
"symfony/dependency-injection": "^2.8|^3 If you'd like to use async event dispatcher container extension."
24+
"symfony/dependency-injection": "^2.8|^3|^4 If you'd like to use async event dispatcher container extension."
2525
},
2626
"autoload": {
2727
"psr-4": { "Enqueue\\AsyncEventDispatcher\\": "" },

Diff for: ‎pkg/dbal/Symfony/DbalTransportFactory.php

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public function createContext(ContainerBuilder $container, array $config)
100100
$factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
101101

102102
$context = new Definition(DbalContext::class);
103+
$context->setPublic(true);
103104
$context->setFactory([new Reference($factoryId), 'createContext']);
104105

105106
$contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -114,6 +115,7 @@ public function createContext(ContainerBuilder $container, array $config)
114115
public function createDriver(ContainerBuilder $container, array $config)
115116
{
116117
$driver = new Definition(DbalDriver::class);
118+
$driver->setPublic(true);
117119
$driver->setArguments([
118120
new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
119121
new Reference('enqueue.client.config'),

Diff for: ‎pkg/dbal/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"enqueue/enqueue": "^0.8@dev",
1717
"enqueue/null": "^0.8@dev",
1818
"queue-interop/queue-spec": "^0.5.3@dev",
19-
"symfony/dependency-injection": "^2.8|^3",
20-
"symfony/config": "^2.8|^3"
19+
"symfony/dependency-injection": "^2.8|^3|^4",
20+
"symfony/config": "^2.8|^3|^4"
2121
},
2222
"autoload": {
2323
"psr-4": { "Enqueue\\Dbal\\": "" },

Diff for: ‎pkg/dbal/examples/consume.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
$config = [
2121
'connection' => [
22-
'dbname' => getenv('SYMFONY__DB__NAME'),
23-
'user' => getenv('SYMFONY__DB__USER'),
24-
'password' => getenv('SYMFONY__DB__PASSWORD'),
25-
'host' => getenv('SYMFONY__DB__HOST'),
26-
'port' => getenv('SYMFONY__DB__PORT'),
27-
'driver' => getenv('SYMFONY__DB__DRIVER'),
22+
'dbname' => getenv('DOCTRINE_DB_NAME'),
23+
'user' => getenv('DOCTRINE_USER'),
24+
'password' => getenv('DOCTRINE_PASSWORD'),
25+
'host' => getenv('DOCTRINE_HOST'),
26+
'port' => getenv('DOCTRINE_PORT'),
27+
'driver' => getenv('DOCTRINE_DRIVER'),
2828
],
2929
];
3030

Diff for: ‎pkg/dbal/examples/produce.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
$config = [
2121
'connection' => [
22-
'dbname' => getenv('SYMFONY__DB__NAME'),
23-
'user' => getenv('SYMFONY__DB__USER'),
24-
'password' => getenv('SYMFONY__DB__PASSWORD'),
25-
'host' => getenv('SYMFONY__DB__HOST'),
26-
'port' => getenv('SYMFONY__DB__PORT'),
27-
'driver' => getenv('SYMFONY__DB__DRIVER'),
22+
'dbname' => getenv('DOCTRINE_DB_NAME'),
23+
'user' => getenv('DOCTRINE_USER'),
24+
'password' => getenv('DOCTRINE_PASSWORD'),
25+
'host' => getenv('DOCTRINE_HOST'),
26+
'port' => getenv('DOCTRINE_PORT'),
27+
'driver' => getenv('DOCTRINE_DRIVER'),
2828
],
2929
];
3030

Diff for: ‎pkg/enqueue-bundle/Profiler/MessageQueueCollector.php

+8
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,12 @@ public function getName()
8282
{
8383
return 'enqueue.message_queue';
8484
}
85+
86+
/**
87+
* {@inheritdoc}
88+
*/
89+
public function reset()
90+
{
91+
$this->data = [];
92+
}
8593
}

0 commit comments

Comments
 (0)