Skip to content

Commit f87bd3a

Browse files
makasimmakasim
authored
Merge pull request #419 from php-enqueue/drop-php-5-support
Drop PHP5 support, Drop Symfony 2.X support.
2 parents d20af46 + 434a5e0 commit f87bd3a

25 files changed

+142
-133
lines changed

‎.travis.yml

+9-23
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,27 @@ language: php
77

88
matrix:
99
include:
10-
- php: 5.6
11-
env: SYMFONY_VERSION=2.8.* UNIT_TESTS=true
1210
- php: 7.1
13-
env: SYMFONY_VERSION=3.0.* PHPSTAN=true
11+
env: SYMFONY_VERSION=3.4.* PHPSTAN=true
1412
- php: 7.1
15-
env: SYMFONY_VERSION=3.0.* PHP_CS_FIXER=true
16-
- php: 7.0
17-
env: SYMFONY_VERSION=2.8.* UNIT_TESTS=true
18-
- php: 5.6
19-
env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
20-
- php: 7.0
21-
env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
22-
- php: 7.1
23-
env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
13+
env: SYMFONY_VERSION=3.4.* PHP_CS_FIXER=true
2414
- php: 7.1
2515
env: SYMFONY_VERSION=3.4.* UNIT_TESTS=true
26-
- php: 7.2
27-
services: docker
28-
env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
29-
- php: 7.1
30-
services: docker
31-
env: SYMFONY_VERSION=3.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
3216
- php: 7.1
33-
services: docker
34-
env: SYMFONY_VERSION=3.2.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
17+
env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
18+
- php: 7.2
19+
env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
3520
- php: 7.1
3621
services: docker
37-
env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
22+
env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
3823
- php: 7.1
3924
services: docker
4025
env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
4126
- php: 7.1
4227
services: docker
43-
env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
28+
env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
4429
allow_failures:
45-
- env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
30+
- env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
4631

4732
cache:
4833
directories:
@@ -53,6 +38,7 @@ install:
5338
- echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
5439
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
5540
- composer install
41+
- ./bin/symlink-pkgs-to-vendor.sh
5642
- if [ "$PREPARE_CONTAINER" = true ]; then docker --version; fi
5743
- if [ "$PREPARE_CONTAINER" = true ]; then docker-compose --version; fi
5844
- if [ "$PREPARE_CONTAINER" = true ]; then bin/dev -b; fi

‎bin/run-fun-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
set -x
44
set -e
55

6-
COMPOSE_PROJECT_NAME=mqdev docker-compose run --workdir="/mqdev" --rm dev ./bin/test "$@"
6+
docker-compose run --workdir="/mqdev" --rm dev ./bin/test "$@"

‎bin/symlink-pkgs-to-vendor.sh

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
3+
set -x
4+
set -e
5+
6+
rm -rf vendor/enqueue/*
7+
ln -s ../../pkg/amqp-bunny vendor/enqueue
8+
ln -s ../../pkg/amqp-ext vendor/enqueue
9+
ln -s ../../pkg/amqp-lib vendor/enqueue
10+
ln -s ../../pkg/amqp-tools vendor/enqueue
11+
ln -s ../../pkg/async-event-dispatcher vendor/enqueue
12+
ln -s ../../pkg/dbal vendor/enqueue
13+
ln -s ../../pkg/enqueue vendor/enqueue
14+
ln -s ../../pkg/enqueue-bundle vendor/enqueue
15+
ln -s ../../pkg/fs vendor/enqueue
16+
ln -s ../../pkg/gearman vendor/enqueue
17+
ln -s ../../pkg/gps vendor/enqueue
18+
ln -s ../../pkg/job-queue vendor/enqueue
19+
ln -s ../../pkg/null vendor/enqueue
20+
ln -s ../../pkg/pheanstalk vendor/enqueue
21+
ln -s ../../pkg/rdkafka vendor/enqueue
22+
ln -s ../../pkg/redis vendor/enqueue
23+
ln -s ../../pkg/simple-client vendor/enqueue
24+
ln -s ../../pkg/sqs vendor/enqueue
25+
ln -s ../../pkg/stomp vendor/enqueue
26+
ln -s ../../pkg/test vendor/enqueue

‎composer.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@
55
"homepage": "https://enqueue.forma-pro.com/",
66
"require": {
77
"php": ">=5.6",
8-
"enqueue/enqueue": "*@dev",
9-
"enqueue/stomp": "*@dev",
10-
"enqueue/amqp-ext": "*@dev",
11-
"enqueue/amqp-lib": "*@dev",
12-
"enqueue/amqp-bunny": "*@dev",
13-
"enqueue/amqp-tools": "*@dev",
8+
"enqueue/enqueue": "0.9.x-dev",
9+
"enqueue/stomp": "0.9.x-dev",
10+
"enqueue/amqp-ext": "0.9.x-dev",
11+
"enqueue/amqp-lib": "0.9.x-dev",
12+
"enqueue/amqp-bunny": "0.9.x-dev",
13+
"enqueue/amqp-tools": "0.9.x-dev",
1414
"php-amqplib/php-amqplib": "^2.7@dev",
15-
"enqueue/redis": "*@dev",
16-
"enqueue/fs": "*@dev",
17-
"enqueue/null": "*@dev",
18-
"enqueue/dbal": "*@dev",
19-
"enqueue/sqs": "*@dev",
20-
"enqueue/pheanstalk": "*@dev",
21-
"enqueue/gearman": "*@dev",
22-
"enqueue/rdkafka": "*@dev",
15+
"enqueue/redis": "0.9.x-dev",
16+
"enqueue/fs": "0.9.x-dev",
17+
"enqueue/null": "0.9.x-dev",
18+
"enqueue/dbal": "0.9.x-dev",
19+
"enqueue/sqs": "0.9.x-dev",
20+
"enqueue/pheanstalk": "0.9.x-dev",
21+
"enqueue/gearman": "0.9.x-dev",
22+
"enqueue/rdkafka": "0.9.x-dev",
2323
"kwn/php-rdkafka-stubs": "^1.0.2",
24-
"enqueue/gps": "*@dev",
25-
"enqueue/enqueue-bundle": "*@dev",
26-
"enqueue/job-queue": "*@dev",
27-
"enqueue/simple-client": "*@dev",
28-
"enqueue/test": "*@dev",
29-
"enqueue/async-event-dispatcher": "*@dev",
24+
"enqueue/gps": "0.9.x-dev",
25+
"enqueue/enqueue-bundle": "0.9.x-dev",
26+
"enqueue/job-queue": "0.9.x-dev",
27+
"enqueue/simple-client": "0.9.x-dev",
28+
"enqueue/test": "0.9.x-dev",
29+
"enqueue/async-event-dispatcher": "0.9.x-dev",
3030
"queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1",
3131
"queue-interop/amqp-interop": "^0.7@dev",
3232
"queue-interop/queue-spec": "^0.5.4@dev",

‎pkg/amqp-bunny/composer.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
10-
11-
"queue-interop/amqp-interop": "^0.7@dev",
9+
"php": "^7.1.3",
10+
"queue-interop/amqp-interop": "^0.8@dev",
1211
"bunny/bunny": "^0.2.4",
1312
"enqueue/amqp-tools": "^0.9@dev"
1413
},
@@ -18,8 +17,8 @@
1817
"enqueue/enqueue": "^0.9@dev",
1918
"enqueue/null": "^0.9@dev",
2019
"queue-interop/queue-spec": "^0.5.3@dev",
21-
"symfony/dependency-injection": "^2.8|^3|^4",
22-
"symfony/config": "^2.8|^3|^4"
20+
"symfony/dependency-injection": "^3.4|^4",
21+
"symfony/config": "^3.4|^4"
2322
},
2423
"support": {
2524
"email": "opensource@forma-pro.com",

‎pkg/amqp-ext/composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
9+
"php": "^7.1.3",
1010
"ext-amqp": "^1.9.3",
11-
"queue-interop/amqp-interop": "^0.7@dev",
11+
"queue-interop/amqp-interop": "^0.8@dev",
1212
"enqueue/amqp-tools": "^0.9@dev"
1313
},
1414
"require-dev": {
@@ -18,8 +18,8 @@
1818
"enqueue/null": "^0.9@dev",
1919
"queue-interop/queue-spec": "^0.5.3@dev",
2020
"empi89/php-amqp-stubs": "*@dev",
21-
"symfony/dependency-injection": "^2.8|^3|^4",
22-
"symfony/config": "^2.8|^3|^4"
21+
"symfony/dependency-injection": "^3.4|^4",
22+
"symfony/config": "^3.4|^4"
2323
},
2424
"support": {
2525
"email": "opensource@forma-pro.com",

‎pkg/amqp-lib/composer.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
10-
"php-amqplib/php-amqplib": "^2.7@dev",
11-
"queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1",
12-
"queue-interop/amqp-interop": "^0.7@dev",
9+
"php": "^7.1.3",
10+
"php-amqplib/php-amqplib": "^2.7",
11+
"queue-interop/amqp-interop": "^0.8@dev",
1312
"enqueue/amqp-tools": "^0.9@dev"
1413
},
1514
"require-dev": {
@@ -18,8 +17,8 @@
1817
"enqueue/enqueue": "^0.9@dev",
1918
"enqueue/null": "^0.9@dev",
2019
"queue-interop/queue-spec": "^0.5.3@dev",
21-
"symfony/dependency-injection": "^2.8|^3|^4",
22-
"symfony/config": "^2.8|^3|^4"
20+
"symfony/dependency-injection": "^3.4|^4",
21+
"symfony/config": "^3.4|^4"
2322
},
2423
"support": {
2524
"email": "opensource@forma-pro.com",

‎pkg/amqp-tools/composer.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
10-
"queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1",
11-
"queue-interop/amqp-interop": "^0.7@dev"
9+
"php": "^7.1.3",
10+
"queue-interop/amqp-interop": "^0.8@dev"
1211
},
1312
"require-dev": {
1413
"phpunit/phpunit": "~5.4.0",

‎pkg/async-event-dispatcher/composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
9+
"php": "^7.1.3",
1010
"enqueue/enqueue": "^0.9@dev",
11-
"symfony/event-dispatcher": "^2.8|^3|^4"
11+
"symfony/event-dispatcher": "^3.4|^4"
1212
},
1313
"require-dev": {
1414
"phpunit/phpunit": "~5.5",
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",
15+
"symfony/dependency-injection": "^3.4|^4",
16+
"symfony/config": "^3.4|^4",
17+
"symfony/http-kernel": "^3.4|^4",
18+
"symfony/filesystem": "^3.4|^4",
1919
"enqueue/null": "^0.9@dev",
2020
"enqueue/fs": "^0.9@dev",
2121
"enqueue/test": "^0.9@dev"

‎pkg/dbal/DbalConsumer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@ private function fetchPrioritizedMessage($now)
213213
->andWhere('queue = :queue')
214214
->andWhere('priority IS NOT NULL')
215215
->andWhere('(delayed_until IS NULL OR delayed_until <= :delayedUntil)')
216-
->addOrderBy('priority', 'desc')
217216
->addOrderBy('published_at', 'asc')
217+
->addOrderBy('priority', 'desc')
218218
->setMaxResults(1)
219219
;
220220

‎pkg/dbal/DbalProducer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function send(PsrDestination $destination, PsrMessage $message)
6363
InvalidDestinationException::assertDestinationInstanceOf($destination, DbalDestination::class);
6464
InvalidMessageException::assertMessageInstanceOf($message, DbalMessage::class);
6565

66-
if (null !== $this->priority && 0 === $message->getPriority()) {
66+
if (null !== $this->priority && null === $message->getPriority()) {
6767
$message->setPriority($this->priority);
6868
}
6969
if (null !== $this->deliveryDelay && null === $message->getDeliveryDelay()) {

‎pkg/dbal/composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
10-
"queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1",
9+
"php": "^7.1.3",
10+
"queue-interop/queue-interop": "^0.7@dev",
1111
"doctrine/dbal": "~2.5",
1212
"ramsey/uuid": "^3"
1313
},
@@ -17,8 +17,8 @@
1717
"enqueue/enqueue": "^0.9@dev",
1818
"enqueue/null": "^0.9@dev",
1919
"queue-interop/queue-spec": "^0.5.5@dev",
20-
"symfony/dependency-injection": "^2.8|^3|^4",
21-
"symfony/config": "^2.8|^3|^4"
20+
"symfony/dependency-injection": "^3.4|^4",
21+
"symfony/config": "^3.4|^4"
2222
},
2323
"support": {
2424
"email": "opensource@forma-pro.com",

‎pkg/enqueue-bundle/composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
10-
"symfony/framework-bundle": "^2.8|^3|^4",
9+
"php": "^7.1.3",
10+
"symfony/framework-bundle": "^3.4|^4",
1111
"enqueue/enqueue": "^0.9@dev",
1212
"enqueue/null": "^0.9@dev",
1313
"enqueue/async-event-dispatcher": "^0.9@dev"
@@ -32,11 +32,11 @@
3232
"enqueue/sqs": "^0.9@dev",
3333
"enqueue/gps": "^0.9@dev",
3434
"enqueue/test": "^0.9@dev",
35-
"php-amqplib/php-amqplib": "^2.7@dev",
35+
"php-amqplib/php-amqplib": "^2.7",
3636
"doctrine/doctrine-bundle": "~1.2",
37-
"symfony/monolog-bundle": "^2.8|^3|^4",
38-
"symfony/browser-kit": "^2.8|^3|^4",
39-
"symfony/expression-language": "^2.8|^3|^4"
37+
"symfony/monolog-bundle": "^3.4|^4",
38+
"symfony/browser-kit": "^3.4|^4",
39+
"symfony/expression-language": "^3.4|^4"
4040
},
4141
"autoload": {
4242
"psr-4": { "Enqueue\\Bundle\\": "" },

‎pkg/enqueue/composer.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
10-
"queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1",
9+
"php": "^7.1.3",
10+
"queue-interop/queue-interop": "^0.7@dev",
1111
"enqueue/null": "^0.9@dev",
1212
"ramsey/uuid": "^2|^3.5",
1313
"psr/log": "^1"
1414
},
1515
"require-dev": {
1616
"phpunit/phpunit": "~5.5",
17-
"symfony/console": "^2.8|^3|^4",
18-
"symfony/dependency-injection": "^2.8|^3|^4",
19-
"symfony/config": "^2.8|^3|^4",
20-
"symfony/event-dispatcher": "^2.8|^3|^4",
21-
"symfony/http-kernel": "^2.8|^3|^4",
17+
"symfony/console": "^3.4|^4",
18+
"symfony/dependency-injection": "^3.4|^4",
19+
"symfony/config": "^3.4|^4",
20+
"symfony/event-dispatcher": "^3.4|^4",
21+
"symfony/http-kernel": "^3.4|^4",
2222
"enqueue/amqp-ext": "^0.9@dev",
2323
"enqueue/amqp-lib": "^0.9@dev",
2424
"enqueue/amqp-bunny": "^0.9@dev",
@@ -37,8 +37,8 @@
3737
},
3838
"suggest": {
3939
"symfony/console": "^2.8|^3|^4 If you want to use li commands",
40-
"symfony/dependency-injection": "^2.8|^3|^4",
41-
"symfony/config": "^2.8|^3|^4",
40+
"symfony/dependency-injection": "^3.4|^4",
41+
"symfony/config": "^3.4|^4",
4242
"enqueue/amqp-ext": "AMQP transport (based on php extension)",
4343
"enqueue/stomp": "STOMP transport",
4444
"enqueue/fs": "Filesystem transport",

‎pkg/fs/composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
10-
"queue-interop/queue-interop": "^0.6|^1.0.0-alpha1",
11-
"symfony/filesystem": "^2.8|^3|^4",
9+
"php": "^7.1.3",
10+
"queue-interop/queue-interop": "^0.7@dev",
11+
"symfony/filesystem": "^3.4|^4",
1212
"makasim/temp-file": "^0.2@stable"
1313
},
1414
"require-dev": {
@@ -17,9 +17,9 @@
1717
"enqueue/null": "^0.9@dev",
1818
"enqueue/test": "^0.9@dev",
1919
"queue-interop/queue-spec": "^0.5.3@dev",
20-
"symfony/dependency-injection": "^2.8|^3|^4",
21-
"symfony/config": "^2.8|^3|^4",
22-
"symfony/phpunit-bridge": "^2.8|^3|^4"
20+
"symfony/dependency-injection": "^3.4|^4",
21+
"symfony/config": "^3.4|^4",
22+
"symfony/phpunit-bridge": "^3.4|^4"
2323
},
2424
"support": {
2525
"email": "opensource@forma-pro.com",

0 commit comments

Comments
 (0)