From a0373408bdbf339b7e68d4998c0ae4f773257713 Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Thu, 5 Apr 2018 10:25:20 +0300 Subject: [PATCH 1/4] Drop PHP5 support, Require Queue Interop with PHP7 features. --- pkg/amqp-bunny/composer.json | 5 ++--- pkg/amqp-ext/composer.json | 4 ++-- pkg/amqp-lib/composer.json | 5 ++--- pkg/amqp-tools/composer.json | 5 ++--- pkg/async-event-dispatcher/composer.json | 2 +- pkg/dbal/composer.json | 4 ++-- pkg/enqueue-bundle/composer.json | 2 +- pkg/enqueue/composer.json | 4 ++-- pkg/fs/composer.json | 4 ++-- pkg/gearman/composer.json | 4 ++-- pkg/gps/composer.json | 4 ++-- pkg/job-queue/composer.json | 2 +- pkg/null/composer.json | 4 ++-- pkg/pheanstalk/composer.json | 4 ++-- pkg/rdkafka/composer.json | 4 ++-- pkg/redis/composer.json | 4 ++-- pkg/simple-client/composer.json | 2 +- pkg/sqs/composer.json | 4 ++-- pkg/stomp/composer.json | 4 ++-- 19 files changed, 34 insertions(+), 37 deletions(-) diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json index af91fd036..67176bddf 100644 --- a/pkg/amqp-bunny/composer.json +++ b/pkg/amqp-bunny/composer.json @@ -6,9 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", - - "queue-interop/amqp-interop": "^0.7@dev", + "php": "^7.1.3", + "queue-interop/amqp-interop": "^0.8@dev", "bunny/bunny": "^0.2.4", "enqueue/amqp-tools": "^0.9@dev" }, diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json index 455229ef2..788465614 100644 --- a/pkg/amqp-ext/composer.json +++ b/pkg/amqp-ext/composer.json @@ -6,9 +6,9 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "ext-amqp": "^1.9.3", - "queue-interop/amqp-interop": "^0.7@dev", + "queue-interop/amqp-interop": "^0.8@dev", "enqueue/amqp-tools": "^0.9@dev" }, "require-dev": { diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json index 2b920e1e1..c8a077ea9 100644 --- a/pkg/amqp-lib/composer.json +++ b/pkg/amqp-lib/composer.json @@ -6,10 +6,9 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "php-amqplib/php-amqplib": "^2.7@dev", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1", - "queue-interop/amqp-interop": "^0.7@dev", + "queue-interop/amqp-interop": "^0.8@dev", "enqueue/amqp-tools": "^0.9@dev" }, "require-dev": { diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json index 7a6c9d107..dcf624a07 100644 --- a/pkg/amqp-tools/composer.json +++ b/pkg/amqp-tools/composer.json @@ -6,9 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1", - "queue-interop/amqp-interop": "^0.7@dev" + "php": "^7.1.3", + "queue-interop/amqp-interop": "^0.8@dev" }, "require-dev": { "phpunit/phpunit": "~5.4.0", diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json index 2d1294f63..b91fb81ca 100644 --- a/pkg/async-event-dispatcher/composer.json +++ b/pkg/async-event-dispatcher/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "enqueue/enqueue": "^0.9@dev", "symfony/event-dispatcher": "^2.8|^3|^4" }, diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json index 8b0fb2178..851fe382c 100644 --- a/pkg/dbal/composer.json +++ b/pkg/dbal/composer.json @@ -6,8 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1", + "php": "^7.1.3", + "queue-interop/queue-interop": "^0.7@dev", "doctrine/dbal": "~2.5", "ramsey/uuid": "^3" }, diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index b83a0b571..2690da725 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "symfony/framework-bundle": "^2.8|^3|^4", "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json index 353c9a9a9..83b015b13 100644 --- a/pkg/enqueue/composer.json +++ b/pkg/enqueue/composer.json @@ -6,8 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1", + "php": "^7.1.3", + "queue-interop/queue-interop": "^0.7@dev", "enqueue/null": "^0.9@dev", "ramsey/uuid": "^2|^3.5", "psr/log": "^1" diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json index f45fe97d0..a2a5cbe0f 100644 --- a/pkg/fs/composer.json +++ b/pkg/fs/composer.json @@ -6,8 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", - "queue-interop/queue-interop": "^0.6|^1.0.0-alpha1", + "php": "^7.1.3", + "queue-interop/queue-interop": "^0.7@dev", "symfony/filesystem": "^2.8|^3|^4", "makasim/temp-file": "^0.2@stable" }, diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json index c446d9665..761a9537f 100644 --- a/pkg/gearman/composer.json +++ b/pkg/gearman/composer.json @@ -6,9 +6,9 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "ext-gearman": "^1.1 || ^2.0", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1" + "queue-interop/queue-interop": "^0.7@dev" }, "require-dev": { "phpunit/phpunit": "~5.4.0", diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json index d3de68c4b..0c1dcfcaa 100644 --- a/pkg/gps/composer.json +++ b/pkg/gps/composer.json @@ -6,8 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1", + "php": "^7.1.3", + "queue-interop/queue-interop": "^0.7@dev", "google/cloud-pubsub": "^0.6.1" }, "require-dev": { diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index bccd7b280..a6f234f5f 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", "doctrine/orm": "~2.4" diff --git a/pkg/null/composer.json b/pkg/null/composer.json index 2b285dbd5..33c8fff77 100644 --- a/pkg/null/composer.json +++ b/pkg/null/composer.json @@ -6,8 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1" + "php": "^7.1.3", + "queue-interop/queue-interop": "^0.7@dev" }, "require-dev": { "phpunit/phpunit": "~5.5", diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json index dcb22821a..35812ed7e 100644 --- a/pkg/pheanstalk/composer.json +++ b/pkg/pheanstalk/composer.json @@ -6,9 +6,9 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "pda/pheanstalk": "^3", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1" + "queue-interop/queue-interop": "^0.7@dev" }, "require-dev": { "phpunit/phpunit": "~5.4.0", diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json index 5a4926ba4..997d8d0e5 100644 --- a/pkg/rdkafka/composer.json +++ b/pkg/rdkafka/composer.json @@ -6,9 +6,9 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "ext-rdkafka": "^3.0.3", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1" + "queue-interop/queue-interop": "^0.7@dev" }, "require-dev": { "phpunit/phpunit": "~5.4.0", diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json index fe7b026a6..924d84475 100644 --- a/pkg/redis/composer.json +++ b/pkg/redis/composer.json @@ -6,8 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1" + "php": "^7.1.3", + "queue-interop/queue-interop": "^0.7@dev" }, "require-dev": { "phpunit/phpunit": "~5.4.0", diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json index 5623c2b12..7e844ebe3 100644 --- a/pkg/simple-client/composer.json +++ b/pkg/simple-client/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "enqueue/enqueue": "^0.9@dev", "symfony/dependency-injection": "^2.8|^3|^4", "symfony/config": "^2.8|^3|^4", diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json index 103c02642..0e5e580eb 100644 --- a/pkg/sqs/composer.json +++ b/pkg/sqs/composer.json @@ -6,8 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1", + "php": "^7.1.3", + "queue-interop/queue-interop": "^0.7@dev", "aws/aws-sdk-php": "~3.26" }, "require-dev": { diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 5c1b5efb0..f40bb10d5 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -6,9 +6,9 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=5.6", + "php": "^7.1.3", "stomp-php/stomp-php": "^4", - "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1", + "queue-interop/queue-interop": "^0.7@dev", "php-http/guzzle6-adapter": "^1.1", "php-http/client-common": "^1.7@dev", "richardfullmer/rabbitmq-management-api": "^2.0" From 60d6fa56417a7dd15bba967ce86bddc5803d3ec1 Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Thu, 5 Apr 2018 10:30:01 +0300 Subject: [PATCH 2/4] Drop Symfony 2.x support, set Symfony 3.4 minimum supported version. --- .travis.yml | 31 ++++++------------------ pkg/amqp-bunny/composer.json | 4 +-- pkg/amqp-ext/composer.json | 4 +-- pkg/amqp-lib/composer.json | 6 ++--- pkg/async-event-dispatcher/composer.json | 10 ++++---- pkg/dbal/composer.json | 4 +-- pkg/enqueue-bundle/composer.json | 10 ++++---- pkg/enqueue/composer.json | 14 +++++------ pkg/fs/composer.json | 8 +++--- pkg/gearman/composer.json | 4 +-- pkg/gps/composer.json | 4 +-- pkg/job-queue/composer.json | 6 ++--- pkg/null/composer.json | 4 +-- pkg/pheanstalk/composer.json | 4 +-- pkg/redis/composer.json | 4 +-- pkg/simple-client/composer.json | 6 ++--- pkg/sqs/composer.json | 4 +-- pkg/stomp/composer.json | 4 +-- 18 files changed, 58 insertions(+), 73 deletions(-) diff --git a/.travis.yml b/.travis.yml index 633ddc8be..f33e06ee9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,42 +7,27 @@ language: php matrix: include: - - php: 5.6 - env: SYMFONY_VERSION=2.8.* UNIT_TESTS=true - php: 7.1 - env: SYMFONY_VERSION=3.0.* PHPSTAN=true + env: SYMFONY_VERSION=3.4.* PHPSTAN=true - php: 7.1 - env: SYMFONY_VERSION=3.0.* PHP_CS_FIXER=true - - php: 7.0 - env: SYMFONY_VERSION=2.8.* UNIT_TESTS=true - - php: 5.6 - env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true - - php: 7.0 - env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true - - php: 7.1 - env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true + env: SYMFONY_VERSION=3.4.* PHP_CS_FIXER=true - php: 7.1 env: SYMFONY_VERSION=3.4.* UNIT_TESTS=true - - php: 7.2 - services: docker - env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - - php: 7.1 - services: docker - env: SYMFONY_VERSION=3.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.1 - services: docker - env: SYMFONY_VERSION=3.2.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true + - php: 7.2 + env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true - php: 7.1 services: docker - env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.1 services: docker env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.1 services: docker - env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true allow_failures: - - env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true + - env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true cache: directories: diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json index 67176bddf..2e03cfac4 100644 --- a/pkg/amqp-bunny/composer.json +++ b/pkg/amqp-bunny/composer.json @@ -17,8 +17,8 @@ "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json index 788465614..dce104835 100644 --- a/pkg/amqp-ext/composer.json +++ b/pkg/amqp-ext/composer.json @@ -18,8 +18,8 @@ "enqueue/null": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", "empi89/php-amqp-stubs": "*@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json index c8a077ea9..aa05811de 100644 --- a/pkg/amqp-lib/composer.json +++ b/pkg/amqp-lib/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": "^7.1.3", - "php-amqplib/php-amqplib": "^2.7@dev", + "php-amqplib/php-amqplib": "^2.7", "queue-interop/amqp-interop": "^0.8@dev", "enqueue/amqp-tools": "^0.9@dev" }, @@ -17,8 +17,8 @@ "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json index b91fb81ca..b71e7e30c 100644 --- a/pkg/async-event-dispatcher/composer.json +++ b/pkg/async-event-dispatcher/composer.json @@ -8,14 +8,14 @@ "require": { "php": "^7.1.3", "enqueue/enqueue": "^0.9@dev", - "symfony/event-dispatcher": "^2.8|^3|^4" + "symfony/event-dispatcher": "^3.4|^4" }, "require-dev": { "phpunit/phpunit": "~5.5", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4", - "symfony/http-kernel": "^2.8|^3|^4", - "symfony/filesystem": "^2.8|^3|^4", + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4", + "symfony/http-kernel": "^3.4|^4", + "symfony/filesystem": "^3.4|^4", "enqueue/null": "^0.9@dev", "enqueue/fs": "^0.9@dev", "enqueue/test": "^0.9@dev" diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json index 851fe382c..d81a0a4b1 100644 --- a/pkg/dbal/composer.json +++ b/pkg/dbal/composer.json @@ -17,8 +17,8 @@ "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", "queue-interop/queue-spec": "^0.5.5@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index 2690da725..1410341a2 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": "^7.1.3", - "symfony/framework-bundle": "^2.8|^3|^4", + "symfony/framework-bundle": "^3.4|^4", "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", "enqueue/async-event-dispatcher": "^0.9@dev" @@ -32,11 +32,11 @@ "enqueue/sqs": "^0.9@dev", "enqueue/gps": "^0.9@dev", "enqueue/test": "^0.9@dev", - "php-amqplib/php-amqplib": "^2.7@dev", + "php-amqplib/php-amqplib": "^2.7", "doctrine/doctrine-bundle": "~1.2", - "symfony/monolog-bundle": "^2.8|^3|^4", - "symfony/browser-kit": "^2.8|^3|^4", - "symfony/expression-language": "^2.8|^3|^4" + "symfony/monolog-bundle": "^3.4|^4", + "symfony/browser-kit": "^3.4|^4", + "symfony/expression-language": "^3.4|^4" }, "autoload": { "psr-4": { "Enqueue\\Bundle\\": "" }, diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json index 83b015b13..11f9def1b 100644 --- a/pkg/enqueue/composer.json +++ b/pkg/enqueue/composer.json @@ -14,11 +14,11 @@ }, "require-dev": { "phpunit/phpunit": "~5.5", - "symfony/console": "^2.8|^3|^4", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4", - "symfony/event-dispatcher": "^2.8|^3|^4", - "symfony/http-kernel": "^2.8|^3|^4", + "symfony/console": "^3.4|^4", + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4", + "symfony/event-dispatcher": "^3.4|^4", + "symfony/http-kernel": "^3.4|^4", "enqueue/amqp-ext": "^0.9@dev", "enqueue/amqp-lib": "^0.9@dev", "enqueue/amqp-bunny": "^0.9@dev", @@ -37,8 +37,8 @@ }, "suggest": { "symfony/console": "^2.8|^3|^4 If you want to use li commands", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4", + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4", "enqueue/amqp-ext": "AMQP transport (based on php extension)", "enqueue/stomp": "STOMP transport", "enqueue/fs": "Filesystem transport", diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json index a2a5cbe0f..8536d822f 100644 --- a/pkg/fs/composer.json +++ b/pkg/fs/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^7.1.3", "queue-interop/queue-interop": "^0.7@dev", - "symfony/filesystem": "^2.8|^3|^4", + "symfony/filesystem": "^3.4|^4", "makasim/temp-file": "^0.2@stable" }, "require-dev": { @@ -17,9 +17,9 @@ "enqueue/null": "^0.9@dev", "enqueue/test": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4", - "symfony/phpunit-bridge": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4", + "symfony/phpunit-bridge": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json index 761a9537f..c5c1ed5d3 100644 --- a/pkg/gearman/composer.json +++ b/pkg/gearman/composer.json @@ -16,8 +16,8 @@ "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json index 0c1dcfcaa..04d7be4e9 100644 --- a/pkg/gps/composer.json +++ b/pkg/gps/composer.json @@ -15,8 +15,8 @@ "enqueue/test": "^0.9@dev", "enqueue/enqueue": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index a6f234f5f..74ba7a24b 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -15,9 +15,9 @@ "phpunit/phpunit": "~5.5", "enqueue/test": "^0.9@dev", "doctrine/doctrine-bundle": "~1.2", - "symfony/browser-kit": "^2.8|^3|^4", - "symfony/expression-language": "^2.8|^3|^4", - "symfony/framework-bundle": "^2.8|^3|^4" + "symfony/browser-kit": "^3.4|^4", + "symfony/expression-language": "^3.4|^4", + "symfony/framework-bundle": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/null/composer.json b/pkg/null/composer.json index 33c8fff77..34a378351 100644 --- a/pkg/null/composer.json +++ b/pkg/null/composer.json @@ -14,8 +14,8 @@ "enqueue/enqueue": "^0.9@dev", "enqueue/test": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json index 35812ed7e..5d1851730 100644 --- a/pkg/pheanstalk/composer.json +++ b/pkg/pheanstalk/composer.json @@ -16,8 +16,8 @@ "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json index 924d84475..a7dc2944e 100644 --- a/pkg/redis/composer.json +++ b/pkg/redis/composer.json @@ -16,8 +16,8 @@ "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json index 7e844ebe3..e900bb9b3 100644 --- a/pkg/simple-client/composer.json +++ b/pkg/simple-client/composer.json @@ -8,9 +8,9 @@ "require": { "php": "^7.1.3", "enqueue/enqueue": "^0.9@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4", - "symfony/console": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4", + "symfony/console": "^3.4|^4" }, "require-dev": { "phpunit/phpunit": "~5.5", diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json index 0e5e580eb..97d8d46d1 100644 --- a/pkg/sqs/composer.json +++ b/pkg/sqs/composer.json @@ -15,8 +15,8 @@ "enqueue/test": "^0.9@dev", "enqueue/enqueue": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index f40bb10d5..7181e485c 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -19,8 +19,8 @@ "enqueue/enqueue": "^0.9@dev", "enqueue/null": "^0.9@dev", "queue-interop/queue-spec": "^0.5.3@dev", - "symfony/dependency-injection": "^2.8|^3|^4", - "symfony/config": "^2.8|^3|^4" + "symfony/dependency-injection": "^3.4|^4", + "symfony/config": "^3.4|^4" }, "support": { "email": "opensource@forma-pro.com", From 37b2631ab05aeb8852625145b63de5cc05be831b Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Sat, 28 Apr 2018 11:54:56 +0300 Subject: [PATCH 3/4] fix priority test. --- bin/run-fun-test.sh | 2 +- pkg/dbal/DbalConsumer.php | 2 +- pkg/dbal/DbalProducer.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/run-fun-test.sh b/bin/run-fun-test.sh index b8150ac54..626741366 100755 --- a/bin/run-fun-test.sh +++ b/bin/run-fun-test.sh @@ -3,4 +3,4 @@ set -x set -e -COMPOSE_PROJECT_NAME=mqdev docker-compose run --workdir="/mqdev" --rm dev ./bin/test "$@" \ No newline at end of file +docker-compose run --workdir="/mqdev" --rm dev ./bin/test "$@" \ No newline at end of file diff --git a/pkg/dbal/DbalConsumer.php b/pkg/dbal/DbalConsumer.php index 202897d63..bee61185c 100644 --- a/pkg/dbal/DbalConsumer.php +++ b/pkg/dbal/DbalConsumer.php @@ -213,8 +213,8 @@ private function fetchPrioritizedMessage($now) ->andWhere('queue = :queue') ->andWhere('priority IS NOT NULL') ->andWhere('(delayed_until IS NULL OR delayed_until <= :delayedUntil)') - ->addOrderBy('priority', 'desc') ->addOrderBy('published_at', 'asc') + ->addOrderBy('priority', 'desc') ->setMaxResults(1) ; diff --git a/pkg/dbal/DbalProducer.php b/pkg/dbal/DbalProducer.php index bdd200f58..3d5c72bd4 100644 --- a/pkg/dbal/DbalProducer.php +++ b/pkg/dbal/DbalProducer.php @@ -63,7 +63,7 @@ public function send(PsrDestination $destination, PsrMessage $message) InvalidDestinationException::assertDestinationInstanceOf($destination, DbalDestination::class); InvalidMessageException::assertMessageInstanceOf($message, DbalMessage::class); - if (null !== $this->priority && 0 === $message->getPriority()) { + if (null !== $this->priority && null === $message->getPriority()) { $message->setPriority($this->priority); } if (null !== $this->deliveryDelay && null === $message->getDeliveryDelay()) { From 402344ccccbcbc5f394b13b67363bbd6abc7ef92 Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Sat, 28 Apr 2018 12:21:20 +0300 Subject: [PATCH 4/4] force 0.9.x pkgs --- .travis.yml | 1 + bin/symlink-pkgs-to-vendor.sh | 26 +++++++++++++++++++++++ composer.json | 40 +++++++++++++++++------------------ 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100755 bin/symlink-pkgs-to-vendor.sh diff --git a/.travis.yml b/.travis.yml index f33e06ee9..2ba36939d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ install: - echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - composer require symfony/symfony:${SYMFONY_VERSION} --no-update - composer install + - ./bin/symlink-pkgs-to-vendor.sh - if [ "$PREPARE_CONTAINER" = true ]; then docker --version; fi - if [ "$PREPARE_CONTAINER" = true ]; then docker-compose --version; fi - if [ "$PREPARE_CONTAINER" = true ]; then bin/dev -b; fi diff --git a/bin/symlink-pkgs-to-vendor.sh b/bin/symlink-pkgs-to-vendor.sh new file mode 100755 index 000000000..3a460b5b7 --- /dev/null +++ b/bin/symlink-pkgs-to-vendor.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +set -x +set -e + +rm -rf vendor/enqueue/* +ln -s ../../pkg/amqp-bunny vendor/enqueue +ln -s ../../pkg/amqp-ext vendor/enqueue +ln -s ../../pkg/amqp-lib vendor/enqueue +ln -s ../../pkg/amqp-tools vendor/enqueue +ln -s ../../pkg/async-event-dispatcher vendor/enqueue +ln -s ../../pkg/dbal vendor/enqueue +ln -s ../../pkg/enqueue vendor/enqueue +ln -s ../../pkg/enqueue-bundle vendor/enqueue +ln -s ../../pkg/fs vendor/enqueue +ln -s ../../pkg/gearman vendor/enqueue +ln -s ../../pkg/gps vendor/enqueue +ln -s ../../pkg/job-queue vendor/enqueue +ln -s ../../pkg/null vendor/enqueue +ln -s ../../pkg/pheanstalk vendor/enqueue +ln -s ../../pkg/rdkafka vendor/enqueue +ln -s ../../pkg/redis vendor/enqueue +ln -s ../../pkg/simple-client vendor/enqueue +ln -s ../../pkg/sqs vendor/enqueue +ln -s ../../pkg/stomp vendor/enqueue +ln -s ../../pkg/test vendor/enqueue diff --git a/composer.json b/composer.json index 35777310d..8c38b226b 100644 --- a/composer.json +++ b/composer.json @@ -5,28 +5,28 @@ "homepage": "https://enqueue.forma-pro.com/", "require": { "php": ">=5.6", - "enqueue/enqueue": "*@dev", - "enqueue/stomp": "*@dev", - "enqueue/amqp-ext": "*@dev", - "enqueue/amqp-lib": "*@dev", - "enqueue/amqp-bunny": "*@dev", - "enqueue/amqp-tools": "*@dev", + "enqueue/enqueue": "0.9.x-dev", + "enqueue/stomp": "0.9.x-dev", + "enqueue/amqp-ext": "0.9.x-dev", + "enqueue/amqp-lib": "0.9.x-dev", + "enqueue/amqp-bunny": "0.9.x-dev", + "enqueue/amqp-tools": "0.9.x-dev", "php-amqplib/php-amqplib": "^2.7@dev", - "enqueue/redis": "*@dev", - "enqueue/fs": "*@dev", - "enqueue/null": "*@dev", - "enqueue/dbal": "*@dev", - "enqueue/sqs": "*@dev", - "enqueue/pheanstalk": "*@dev", - "enqueue/gearman": "*@dev", - "enqueue/rdkafka": "*@dev", + "enqueue/redis": "0.9.x-dev", + "enqueue/fs": "0.9.x-dev", + "enqueue/null": "0.9.x-dev", + "enqueue/dbal": "0.9.x-dev", + "enqueue/sqs": "0.9.x-dev", + "enqueue/pheanstalk": "0.9.x-dev", + "enqueue/gearman": "0.9.x-dev", + "enqueue/rdkafka": "0.9.x-dev", "kwn/php-rdkafka-stubs": "^1.0.2", - "enqueue/gps": "*@dev", - "enqueue/enqueue-bundle": "*@dev", - "enqueue/job-queue": "*@dev", - "enqueue/simple-client": "*@dev", - "enqueue/test": "*@dev", - "enqueue/async-event-dispatcher": "*@dev", + "enqueue/gps": "0.9.x-dev", + "enqueue/enqueue-bundle": "0.9.x-dev", + "enqueue/job-queue": "0.9.x-dev", + "enqueue/simple-client": "0.9.x-dev", + "enqueue/test": "0.9.x-dev", + "enqueue/async-event-dispatcher": "0.9.x-dev", "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1", "queue-interop/amqp-interop": "^0.7@dev", "queue-interop/queue-spec": "^0.5.4@dev",