Skip to content

Commit c6fd5b1

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

File tree

61 files changed

+345
-205
lines changed

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

‎.travis.yml‎

Lines changed: 5 additions & 0 deletions
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

‎composer.json‎

Lines changed: 8 additions & 7 deletions
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": [

‎docker-compose.yml‎

Lines changed: 17 additions & 17 deletions
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

‎pkg/amqp-bunny/composer.json‎

Lines changed: 2 additions & 2 deletions
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\\": "" },

‎pkg/amqp-ext/composer.json‎

Lines changed: 2 additions & 2 deletions
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\\": "" },

‎pkg/amqp-ext/examples/consume.php‎

Lines changed: 5 additions & 5 deletions
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);

‎pkg/amqp-ext/examples/produce.php‎

Lines changed: 5 additions & 5 deletions
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);

‎pkg/amqp-lib/composer.json‎

Lines changed: 2 additions & 2 deletions
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\\": "" },

‎pkg/amqp-lib/examples/consume.php‎

Lines changed: 5 additions & 5 deletions
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

‎pkg/amqp-lib/examples/produce.php‎

Lines changed: 5 additions & 5 deletions
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);

0 commit comments

Comments
 (0)