From b9e68a043345b1c00437037e9f722188a413a843 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Fri, 17 Feb 2023 19:56:29 +0200 Subject: [PATCH 01/15] Add PHP 8.1 and Symfony 6.1 & .2 to CI --- .github/workflows/ci.yml | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35e32c10f..8860c2e0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: extensions: mongodb, redis, :xdebug ini-values: memory_limit=2048M - - run: php ./bin/fix-symfony-version.php "5.2.*" + - run: php ./bin/fix-symfony-version.php "5.4.*" - uses: "ramsey/composer-install@v1" @@ -63,7 +63,7 @@ jobs: extensions: mongodb, redis, :xdebug ini-values: memory_limit=2048M - - run: php ./bin/fix-symfony-version.php "5.2.*" + - run: php ./bin/fix-symfony-version.php "5.4.*" - run: composer update --no-progress @@ -77,14 +77,20 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4', '8.0'] - symfony_version: ['5.2.*', '6.0.*'] + php: ['7.4', '8.0', '8.1'] + symfony_version: ['5.4.*', '6.0.*', '6.1.*', '6.2.*'] dependencies: ['--prefer-lowest', '--prefer-dist'] exclude: - - php: '7.3' - symfony_version: '6.0.*' - php: '7.4' symfony_version: '6.0.*' + - php: '7.4' + symfony_version: '6.1.*' + - php: '7.4' + symfony_version: '6.2.*' + - php: '8.0' + symfony_version: '6.1.*' + - php: '8.0' + symfony_version: '6.2.*' name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }} @@ -123,15 +129,21 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.4', '8.0'] # same as in the container - symfony_version: ['5.2.*', '6.0.*'] + php: ['7.4', '8.0', '8.1'] # same as in the container + symfony_version: ['5.4.*', '6.0.*', '6.1.*', '6.2.*'] dependencies: ['--prefer-lowest', '--prefer-dist'] rdkafka_action: ['exclude-group', 'group'] exclude: - - php: '7.3' - symfony_version: '6.0.*' - php: '7.4' symfony_version: '6.0.*' + - php: '7.4' + symfony_version: '6.1.*' + - php: '7.4' + symfony_version: '6.2.*' + - php: '8.0' + symfony_version: '6.1.*' + - php: '8.0' + symfony_version: '6.2.*' name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}, deps=${{ matrix.dependencies }} From 757eb4bd9b5d34127ccdc0353e43d5153a8d92e9 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Fri, 17 Feb 2023 20:13:03 +0200 Subject: [PATCH 02/15] Drop sf 6.0, remove 6.1 --- .github/workflows/ci.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8860c2e0d..830840b76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,17 +78,11 @@ jobs: fail-fast: false matrix: php: ['7.4', '8.0', '8.1'] - symfony_version: ['5.4.*', '6.0.*', '6.1.*', '6.2.*'] + symfony_version: ['5.4.*', '6.2.*'] dependencies: ['--prefer-lowest', '--prefer-dist'] exclude: - - php: '7.4' - symfony_version: '6.0.*' - - php: '7.4' - symfony_version: '6.1.*' - php: '7.4' symfony_version: '6.2.*' - - php: '8.0' - symfony_version: '6.1.*' - php: '8.0' symfony_version: '6.2.*' @@ -130,18 +124,12 @@ jobs: fail-fast: false matrix: php: ['7.4', '8.0', '8.1'] # same as in the container - symfony_version: ['5.4.*', '6.0.*', '6.1.*', '6.2.*'] + symfony_version: ['5.4.*', '6.2.*'] dependencies: ['--prefer-lowest', '--prefer-dist'] rdkafka_action: ['exclude-group', 'group'] exclude: - - php: '7.4' - symfony_version: '6.0.*' - - php: '7.4' - symfony_version: '6.1.*' - php: '7.4' symfony_version: '6.2.*' - - php: '8.0' - symfony_version: '6.1.*' - php: '8.0' symfony_version: '6.2.*' From 716764a1e2b3ece1cfa71f1596273d5fbb03c8e3 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Sun, 19 Feb 2023 15:13:41 +0200 Subject: [PATCH 03/15] Properly drop old PHP and Symfony versions --- composer.json | 24 ++++++++++++------------ pkg/amqp-bunny/composer.json | 2 +- pkg/amqp-ext/composer.json | 2 +- pkg/amqp-lib/composer.json | 2 +- pkg/amqp-tools/composer.json | 2 +- pkg/async-command/composer.json | 18 +++++++++--------- pkg/async-event-dispatcher/composer.json | 16 ++++++++-------- pkg/dbal/composer.json | 2 +- pkg/dsn/composer.json | 2 +- pkg/enqueue-bundle/composer.json | 10 +++++----- pkg/enqueue/composer.json | 20 ++++++++++---------- pkg/fs/composer.json | 8 ++++---- pkg/gearman/composer.json | 2 +- pkg/gps/composer.json | 2 +- pkg/job-queue/composer.json | 10 +++++----- pkg/mongodb/composer.json | 2 +- pkg/monitoring/composer.json | 2 +- pkg/null/composer.json | 2 +- pkg/pheanstalk/composer.json | 2 +- pkg/rdkafka/composer.json | 2 +- pkg/redis/composer.json | 2 +- pkg/simple-client/composer.json | 6 +++--- pkg/sns/composer.json | 2 +- pkg/snsqs/composer.json | 2 +- pkg/sqs/composer.json | 2 +- pkg/stomp/composer.json | 2 +- pkg/wamp/composer.json | 2 +- 27 files changed, 75 insertions(+), 75 deletions(-) diff --git a/composer.json b/composer.json index b454f84fd..d2874af50 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon" }, "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "ext-amqp": "^1.9.3", "ext-gearman": "^2.0", @@ -53,17 +53,17 @@ "phpunit/phpunit": "^9.5", "phpstan/phpstan": "^0.12", "queue-interop/queue-spec": "^0.6.2", - "symfony/browser-kit": "^5.1|^6.0", - "symfony/config": "^5.1|^6.0", - "symfony/process": "^5.1|^6.0", - "symfony/console": "^5.1|^6.0", - "symfony/dependency-injection": "^5.1|^6.0", - "symfony/event-dispatcher": "^5.1|^6.0", - "symfony/expression-language": "^5.1|^6.0", - "symfony/http-kernel": "^5.1|^6.0", - "symfony/filesystem": "^5.1|^6.0", - "symfony/framework-bundle": "^5.1|^6.0", - "symfony/yaml": "^5.1|^6.0", + "symfony/browser-kit": "^5.4|^6.0", + "symfony/config": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/console": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/expression-language": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/filesystem": "^5.4|^6.0", + "symfony/framework-bundle": "^5.4|^6.0", + "symfony/yaml": "^5.4|^6.0", "empi89/php-amqp-stubs": "*@dev", "doctrine/doctrine-bundle": "^2.0", "doctrine/mongodb-odm-bundle": "^3.5|^4.3", diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json index 6efe7ee84..5bffcebd8 100644 --- a/pkg/amqp-bunny/composer.json +++ b/pkg/amqp-bunny/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/amqp-interop": "^0.8.2", "queue-interop/queue-interop": "^0.8", "bunny/bunny": "^0.4|^0.5", diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json index 91c572a25..57fb5b20c 100644 --- a/pkg/amqp-ext/composer.json +++ b/pkg/amqp-ext/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "ext-amqp": "^1.9.3", "queue-interop/amqp-interop": "^0.8.2", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json index 3f66bf7b3..dfb73a311 100644 --- a/pkg/amqp-lib/composer.json +++ b/pkg/amqp-lib/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "php-amqplib/php-amqplib": "^3.2", "queue-interop/amqp-interop": "^0.8.2", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json index ccc282006..55f82f5d7 100644 --- a/pkg/amqp-tools/composer.json +++ b/pkg/amqp-tools/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/amqp-interop": "^0.8.2", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10" diff --git a/pkg/async-command/composer.json b/pkg/async-command/composer.json index 98b90ad83..48fd6f089 100644 --- a/pkg/async-command/composer.json +++ b/pkg/async-command/composer.json @@ -6,19 +6,19 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/queue-interop": "^0.8", - "symfony/console": "^5.1|^6.0", - "symfony/process": "^5.1|^6.0" + "symfony/console": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0" }, "require-dev": { "phpunit/phpunit": "^9.5", - "symfony/dependency-injection": "^5.1|^6.0", - "symfony/config": "^5.1|^6.0", - "symfony/http-kernel": "^5.1|^6.0", - "symfony/filesystem": "^5.1|^6.0", - "symfony/yaml": "^5.1|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/config": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/filesystem": "^5.4|^6.0", + "symfony/yaml": "^5.4|^6.0", "enqueue/null": "0.10.x-dev", "enqueue/fs": "0.10.x-dev", "enqueue/test": "0.10.x-dev" @@ -31,7 +31,7 @@ "docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md" }, "suggest": { - "symfony/dependency-injection": "^5.1|^6.0 If you'd like to use async event dispatcher container extension." + "symfony/dependency-injection": "^5.4|^6.0 If you'd like to use async event dispatcher container extension." }, "autoload": { "psr-4": { "Enqueue\\AsyncCommand\\": "" }, diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json index 3f124dc8f..a2cef0d79 100644 --- a/pkg/async-event-dispatcher/composer.json +++ b/pkg/async-event-dispatcher/composer.json @@ -6,18 +6,18 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/queue-interop": "^0.8", - "symfony/event-dispatcher": "^5.1|^6.0" + "symfony/event-dispatcher": "^5.4|^6.0" }, "require-dev": { "phpunit/phpunit": "^9.5", - "symfony/dependency-injection": "^5.1|^6.0", - "symfony/config": "^5.1|^6.0", - "symfony/http-kernel": "^5.1|^6.0", - "symfony/filesystem": "^5.1|^6.0", - "symfony/yaml": "^5.1|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/config": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/filesystem": "^5.4|^6.0", + "symfony/yaml": "^5.4|^6.0", "enqueue/null": "0.10.x-dev", "enqueue/fs": "0.10.x-dev", "enqueue/test": "0.10.x-dev" @@ -30,7 +30,7 @@ "docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md" }, "suggest": { - "symfony/dependency-injection": "^5.1|^6.0 If you'd like to use async event dispatcher container extension." + "symfony/dependency-injection": "^5.4|^6.0 If you'd like to use async event dispatcher container extension." }, "autoload": { "psr-4": { "Enqueue\\AsyncEventDispatcher\\": "" }, diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json index 950387387..0e05824c6 100644 --- a/pkg/dbal/composer.json +++ b/pkg/dbal/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "doctrine/dbal": "^2.12|^3.1", "doctrine/persistence": "^1.3.3|^2.0", diff --git a/pkg/dsn/composer.json b/pkg/dsn/composer.json index 3cdac4c2d..94fb18a9f 100644 --- a/pkg/dsn/composer.json +++ b/pkg/dsn/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0" + "php": "^7.4|^8.0" }, "require-dev": { "phpunit/phpunit": "^9.5" diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index ab4ed1e4f..618b4ea7a 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -6,8 +6,8 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", - "symfony/framework-bundle": "^5.1|^6.0", + "php": "^7.4|^8.0", + "symfony/framework-bundle": "^5.4|^6.0", "queue-interop/amqp-interop": "^0.8.2", "queue-interop/queue-interop": "^0.8", "enqueue/enqueue": "^0.10", @@ -39,9 +39,9 @@ "doctrine/doctrine-bundle": "^2.0", "doctrine/mongodb-odm-bundle": "^3.5|^4.3", "alcaeus/mongo-php-adapter": "^1.0", - "symfony/browser-kit": "^5.1|^6.0", - "symfony/expression-language": "^5.1|^6.0", - "symfony/yaml": "^5.1|^6.0" + "symfony/browser-kit": "^5.4|^6.0", + "symfony/expression-language": "^5.4|^6.0", + "symfony/yaml": "^5.4|^6.0" }, "suggest": { "enqueue/async-command": "If want to run Symfony command via message queue", diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json index 0798bf44e..0da00ee4b 100644 --- a/pkg/enqueue/composer.json +++ b/pkg/enqueue/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/amqp-interop": "^0.8.2", "queue-interop/queue-interop": "^0.8", "enqueue/null": "^0.10", @@ -17,12 +17,12 @@ }, "require-dev": { "phpunit/phpunit": "^9.5", - "symfony/console": "^5.1|^6.0", - "symfony/dependency-injection": "^5.1|^6.0", - "symfony/config": "^5.1|^6.0", - "symfony/event-dispatcher": "^5.1|^6.0", - "symfony/http-kernel": "^5.1|^6.0", - "symfony/yaml": "^5.1|^6.0", + "symfony/console": "^5.41|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/config": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/yaml": "^5.4|^6.0", "enqueue/amqp-ext": "0.10.x-dev", "enqueue/amqp-lib": "0.10.x-dev", "enqueue/amqp-bunny": "0.10.x-dev", @@ -42,9 +42,9 @@ "enqueue/dsn": "0.10.x-dev" }, "suggest": { - "symfony/console": "^5.1|^6.0 If you want to use cli commands", - "symfony/dependency-injection": "^5.1|^6.0", - "symfony/config": "^5.1|^6.0", + "symfony/console": "^5.4|^6.0 If you want to use cli commands", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/config": "^5.4|^6.0", "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 e22929097..b44900541 100644 --- a/pkg/fs/composer.json +++ b/pkg/fs/composer.json @@ -6,10 +6,10 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", - "symfony/filesystem": "^5.1|^6.0", + "symfony/filesystem": "^5.4|^6.0", "makasim/temp-file": "^0.2@stable" }, "require-dev": { @@ -17,8 +17,8 @@ "enqueue/null": "0.10.x-dev", "enqueue/test": "0.10.x-dev", "queue-interop/queue-spec": "^0.6.2", - "symfony/dependency-injection": "^5.1|^6.0", - "symfony/yaml": "^5.1|^6.0" + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/yaml": "^5.4|^6.0" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json index 4dfdb3781..eb06f62e3 100644 --- a/pkg/gearman/composer.json +++ b/pkg/gearman/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "ext-gearman": "^2.0", "queue-interop/queue-interop": "^0.8" }, diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json index 53445fe32..2da6b7468 100644 --- a/pkg/gps/composer.json +++ b/pkg/gps/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "google/cloud-pubsub": "^1.4.3", "enqueue/dsn": "^0.10" diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index 1525c5c8e..5fafab868 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": "^7.3|^8.0", + "php": "^7.4|^8.0", "enqueue/enqueue": "^0.10", "enqueue/null": "^0.10", "queue-interop/queue-interop": "^0.8", @@ -17,10 +17,10 @@ "phpunit/phpunit": "^9.5", "enqueue/test": "0.10.x-dev", "doctrine/doctrine-bundle": "^2.0", - "symfony/browser-kit": "^5.1|^6.0", - "symfony/expression-language": "^5.1|^6.0", - "symfony/framework-bundle": "^5.1|^6.0", - "symfony/yaml": "^5.1|^6.0" + "symfony/browser-kit": "^5.4|^6.0", + "symfony/expression-language": "^5.4|^6.0", + "symfony/framework-bundle": "^5.4|^6.0", + "symfony/yaml": "^5.4|^6.0" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/mongodb/composer.json b/pkg/mongodb/composer.json index 8089c1a4f..775452949 100644 --- a/pkg/mongodb/composer.json +++ b/pkg/mongodb/composer.json @@ -10,7 +10,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "mongodb/mongodb": "^1.2", "ext-mongodb": "^1.5" diff --git a/pkg/monitoring/composer.json b/pkg/monitoring/composer.json index ebc0b1c6e..e19da2fa9 100644 --- a/pkg/monitoring/composer.json +++ b/pkg/monitoring/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "enqueue/enqueue": "^0.10", "enqueue/dsn": "^0.10" }, diff --git a/pkg/null/composer.json b/pkg/null/composer.json index ab84dc36e..0f4ac4eeb 100644 --- a/pkg/null/composer.json +++ b/pkg/null/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8" }, "require-dev": { diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json index bb019e2d9..8d920a4ff 100644 --- a/pkg/pheanstalk/composer.json +++ b/pkg/pheanstalk/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "pda/pheanstalk": "^3.1", "queue-interop/queue-interop": "^0.8" }, diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json index 2b5ec5541..068b9d204 100644 --- a/pkg/rdkafka/composer.json +++ b/pkg/rdkafka/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "ext-rdkafka": "^4.0|^5.0|^6.0", "queue-interop/queue-interop": "^0.8.1" }, diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json index 4fd68f139..4742b3385 100644 --- a/pkg/redis/composer.json +++ b/pkg/redis/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "ramsey/uuid": "^3.5|^4" diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json index f12215eac..7cb07b6b3 100644 --- a/pkg/simple-client/composer.json +++ b/pkg/simple-client/composer.json @@ -6,11 +6,11 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/amqp-interop": "^0.8.2", "queue-interop/queue-interop": "^0.8", - "symfony/config": "^5.1|^6.0" + "symfony/config": "^5.4|^6.0" }, "require-dev": { "phpunit/phpunit": "^9.5", @@ -18,7 +18,7 @@ "enqueue/amqp-ext": "0.10.x-dev", "enqueue/fs": "0.10.x-dev", "enqueue/null": "0.10.x-dev", - "symfony/yaml": "^5.1|^6.0" + "symfony/yaml": "^5.4|^6.0" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/sns/composer.json b/pkg/sns/composer.json index ef3cf6f87..297fac858 100644 --- a/pkg/sns/composer.json +++ b/pkg/sns/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "aws/aws-sdk-php": "~3.155" diff --git a/pkg/snsqs/composer.json b/pkg/snsqs/composer.json index bf68aeb8d..27a4e038e 100644 --- a/pkg/snsqs/composer.json +++ b/pkg/snsqs/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "enqueue/sns": "^0.10", diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json index 2b2473927..d48b89015 100644 --- a/pkg/sqs/composer.json +++ b/pkg/sqs/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "aws/aws-sdk-php": "~3.155" diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 383ce6fe9..461205852 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "enqueue/dsn": "^0.10", "stomp-php/stomp-php": "^4.5|^5.0", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/wamp/composer.json b/pkg/wamp/composer.json index 89bdbf315..be0321c6f 100644 --- a/pkg/wamp/composer.json +++ b/pkg/wamp/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8.1", "enqueue/dsn": "^0.10.8", "thruway/client": "^0.5.5", From beacd0ac72b3d01d5b6dfda644bf03bae97a3105 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 20 Mar 2023 14:34:29 +0200 Subject: [PATCH 04/15] Install the mongodb extension again? --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index b1e0d8b03..381d40b0d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -22,6 +22,7 @@ RUN set -x && \ php${PHP_VERSION}-xml \ php${PHP_VERSION}-mysql \ php${PHP_VERSION}-curl \ + php${PHP_VERSION}-mongodb \ make \ g++ \ unzip \ From 8f4520b7a2fe7cb607e99c1965b806ff8cfd340a Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 20 Mar 2023 14:56:25 +0200 Subject: [PATCH 05/15] Install the mbstring extension --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 381d40b0d..4c288b041 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,6 +23,7 @@ RUN set -x && \ php${PHP_VERSION}-mysql \ php${PHP_VERSION}-curl \ php${PHP_VERSION}-mongodb \ + php${PHP_VERSION}-mbstring \ make \ g++ \ unzip \ From 4a140981e51dd80cd29e0939ee158f2d27647ca9 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 20 Mar 2023 16:38:26 +0200 Subject: [PATCH 06/15] Remove special group for rdkafka tests --- pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php | 3 --- pkg/rdkafka/Tests/JsonSerializerTest.php | 3 --- pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php | 3 --- pkg/rdkafka/Tests/RdKafkaConsumerTest.php | 3 --- pkg/rdkafka/Tests/RdKafkaContextTest.php | 3 --- pkg/rdkafka/Tests/RdKafkaMessageTest.php | 3 --- pkg/rdkafka/Tests/RdKafkaProducerTest.php | 3 --- pkg/rdkafka/Tests/RdKafkaTopicTest.php | 3 --- pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php | 3 --- pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php | 3 --- pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php | 3 --- pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php | 3 --- .../Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php | 1 - pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php | 3 --- 14 files changed, 40 deletions(-) diff --git a/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php b/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php index 659590ba3..3b92042dd 100644 --- a/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php @@ -19,9 +19,6 @@ use Interop\Queue\Queue as InteropQueue; use PHPUnit\Framework\TestCase; -/** - * @group rdkafka - */ class RdKafkaDriverTest extends TestCase { use ClassExtensionTrait; diff --git a/pkg/rdkafka/Tests/JsonSerializerTest.php b/pkg/rdkafka/Tests/JsonSerializerTest.php index 84f09a698..d4db377d3 100644 --- a/pkg/rdkafka/Tests/JsonSerializerTest.php +++ b/pkg/rdkafka/Tests/JsonSerializerTest.php @@ -8,9 +8,6 @@ use Enqueue\Test\ClassExtensionTrait; use PHPUnit\Framework\TestCase; -/** - * @group rdkafka - */ class JsonSerializerTest extends TestCase { use ClassExtensionTrait; diff --git a/pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php b/pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php index 8af3e8501..62ccc7612 100644 --- a/pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php +++ b/pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php @@ -6,9 +6,6 @@ use Enqueue\Test\ReadAttributeTrait; use PHPUnit\Framework\TestCase; -/** - * @group rdkafka - */ class RdKafkaConnectionFactoryTest extends TestCase { use ReadAttributeTrait; diff --git a/pkg/rdkafka/Tests/RdKafkaConsumerTest.php b/pkg/rdkafka/Tests/RdKafkaConsumerTest.php index b40916c15..627831982 100644 --- a/pkg/rdkafka/Tests/RdKafkaConsumerTest.php +++ b/pkg/rdkafka/Tests/RdKafkaConsumerTest.php @@ -11,9 +11,6 @@ use RdKafka\KafkaConsumer; use RdKafka\Message; -/** - * @group rdkafka - */ class RdKafkaConsumerTest extends TestCase { public function testCouldBeConstructedWithRequiredArguments() diff --git a/pkg/rdkafka/Tests/RdKafkaContextTest.php b/pkg/rdkafka/Tests/RdKafkaContextTest.php index 227eea792..dc1b597de 100644 --- a/pkg/rdkafka/Tests/RdKafkaContextTest.php +++ b/pkg/rdkafka/Tests/RdKafkaContextTest.php @@ -10,9 +10,6 @@ use Interop\Queue\Exception\TemporaryQueueNotSupportedException; use PHPUnit\Framework\TestCase; -/** - * @group rdkafka - */ class RdKafkaContextTest extends TestCase { public function testThrowNotImplementedOnCreateTemporaryQueue() diff --git a/pkg/rdkafka/Tests/RdKafkaMessageTest.php b/pkg/rdkafka/Tests/RdKafkaMessageTest.php index c2e5c224a..9bcc34642 100644 --- a/pkg/rdkafka/Tests/RdKafkaMessageTest.php +++ b/pkg/rdkafka/Tests/RdKafkaMessageTest.php @@ -6,9 +6,6 @@ use PHPUnit\Framework\TestCase; use RdKafka\Message; -/** - * @group rdkafka - */ class RdKafkaMessageTest extends TestCase { public function testCouldSetGetPartition() diff --git a/pkg/rdkafka/Tests/RdKafkaProducerTest.php b/pkg/rdkafka/Tests/RdKafkaProducerTest.php index 512cc9f5a..eec4b364e 100644 --- a/pkg/rdkafka/Tests/RdKafkaProducerTest.php +++ b/pkg/rdkafka/Tests/RdKafkaProducerTest.php @@ -15,9 +15,6 @@ use RdKafka\ProducerTopic; use RdKafka\TopicConf; -/** - * @group rdkafka - */ class RdKafkaProducerTest extends TestCase { public function testCouldBeConstructedWithKafkaProducerAndSerializerAsArguments() diff --git a/pkg/rdkafka/Tests/RdKafkaTopicTest.php b/pkg/rdkafka/Tests/RdKafkaTopicTest.php index 5ed22885a..d0bc8cc13 100644 --- a/pkg/rdkafka/Tests/RdKafkaTopicTest.php +++ b/pkg/rdkafka/Tests/RdKafkaTopicTest.php @@ -6,9 +6,6 @@ use PHPUnit\Framework\TestCase; use RdKafka\TopicConf; -/** - * @group rdkafka - */ class RdKafkaTopicTest extends TestCase { public function testCouldSetGetPartition() diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php index 3327c952d..a582aadca 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php @@ -5,9 +5,6 @@ use Enqueue\RdKafka\RdKafkaConnectionFactory; use Interop\Queue\Spec\ConnectionFactorySpec; -/** - * @group rdkafka - */ class RdKafkaConnectionFactoryTest extends ConnectionFactorySpec { protected function createConnectionFactory() diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php index fe9625677..d049ca74f 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php @@ -5,9 +5,6 @@ use Enqueue\RdKafka\RdKafkaContext; use Interop\Queue\Spec\ContextSpec; -/** - * @group rdkafka - */ class RdKafkaContextTest extends ContextSpec { protected function createContext() diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php index a29780b0f..df54fa58b 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php @@ -5,9 +5,6 @@ use Enqueue\RdKafka\RdKafkaMessage; use Interop\Queue\Spec\MessageSpec; -/** - * @group rdkafka - */ class RdKafkaMessageTest extends MessageSpec { /** diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php index 93bc7ac14..863f3e3c5 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php @@ -5,9 +5,6 @@ use Enqueue\RdKafka\RdKafkaTopic; use Interop\Queue\Spec\QueueSpec; -/** - * @group rdkafka - */ class RdKafkaQueueTest extends QueueSpec { protected function createQueue() diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php index d756f23e2..afe344ae1 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php @@ -7,7 +7,6 @@ use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec; /** - * @group rdkafka * @group functional * @retry 5 */ diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php index 26aacc78d..c5d43ee61 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php @@ -5,9 +5,6 @@ use Enqueue\RdKafka\RdKafkaTopic; use Interop\Queue\Spec\TopicSpec; -/** - * @group rdkafka - */ class RdKafkaTopicTest extends TopicSpec { /** From 8403eb4bcded283612b8111f0dd8e0ab58c0cb1f Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 20 Mar 2023 16:38:41 +0200 Subject: [PATCH 07/15] Skip Gearman tests on PHP 8.1 --- .github/workflows/ci.yml | 8 +++++++- pkg/gearman/Tests/GearmanContextTest.php | 1 + pkg/gearman/Tests/Spec/GearmanContextTest.php | 1 + .../Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php | 1 + .../Spec/GearmanSendToAndReceiveNoWaitFromQueueTest.php | 1 + .../Spec/GearmanSendToTopicAndReceiveFromQueueTest.php | 1 + .../GearmanSendToTopicAndReceiveNoWaitFromQueueTest.php | 1 + 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 830840b76..a7ea3c0bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,4 +167,10 @@ jobs: env: PHP_VERSION: ${{ matrix.php }} - - run: bin/test.sh --${{ matrix.rdkafka_action }}=rdkafka + # TODO: convert these two steps into one w/o excludes when Gearman extension gets a release for PHP 8.1 + # See https://github.com/php/pecl-networking-gearman/issues/16 + - run: bin/test.sh + if: ${{ matrix.php }} != '8.1' + + - run: bin/test.sh --exclude-group=gearman + if: ${{ matrix.php }} == '8.1' diff --git a/pkg/gearman/Tests/GearmanContextTest.php b/pkg/gearman/Tests/GearmanContextTest.php index 484ab00a0..f2b70d11b 100644 --- a/pkg/gearman/Tests/GearmanContextTest.php +++ b/pkg/gearman/Tests/GearmanContextTest.php @@ -12,6 +12,7 @@ /** * @group functional + * @group gearman */ class GearmanContextTest extends TestCase { diff --git a/pkg/gearman/Tests/Spec/GearmanContextTest.php b/pkg/gearman/Tests/Spec/GearmanContextTest.php index 431465cc5..7bfeee374 100644 --- a/pkg/gearman/Tests/Spec/GearmanContextTest.php +++ b/pkg/gearman/Tests/Spec/GearmanContextTest.php @@ -7,6 +7,7 @@ /** * @group functional + * @group gearman */ class GearmanContextTest extends ContextSpec { diff --git a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php b/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php index 80b13f8df..11bbf730d 100644 --- a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php +++ b/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php @@ -9,6 +9,7 @@ /** * @group functional + * @group gearman */ class GearmanSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec { diff --git a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveNoWaitFromQueueTest.php b/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveNoWaitFromQueueTest.php index 590b8ede5..86ce5b189 100644 --- a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveNoWaitFromQueueTest.php +++ b/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveNoWaitFromQueueTest.php @@ -8,6 +8,7 @@ /** * @group functional + * @group gearman */ class GearmanSendToAndReceiveNoWaitFromQueueTest extends SendToAndReceiveNoWaitFromQueueSpec { diff --git a/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveFromQueueTest.php b/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveFromQueueTest.php index 4d53934ff..c3f470528 100644 --- a/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveFromQueueTest.php +++ b/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveFromQueueTest.php @@ -8,6 +8,7 @@ /** * @group functional + * @group gearman */ class GearmanSendToTopicAndReceiveFromQueueTest extends SendToTopicAndReceiveFromQueueSpec { diff --git a/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveNoWaitFromQueueTest.php index 26e6f79a4..25c3596a1 100644 --- a/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveNoWaitFromQueueTest.php +++ b/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveNoWaitFromQueueTest.php @@ -8,6 +8,7 @@ /** * @group functional + * @group gearman */ class GearmanSendToTopicAndReceiveNoWaitFromQueueTest extends SendToTopicAndReceiveNoWaitFromQueueSpec { From 28292de937bc85c0fa55df78ab310a15709631c5 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 20 Mar 2023 16:49:00 +0200 Subject: [PATCH 08/15] Fix CS --- pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php | 3 --- .../Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php | 3 +-- pkg/rdkafka/Tests/JsonSerializerTest.php | 2 +- pkg/rdkafka/Tests/RdKafkaConsumerTest.php | 4 ++-- pkg/rdkafka/Tests/RdKafkaProducerTest.php | 2 +- .../Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php | 1 + 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php b/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php index 3b92042dd..c5e40e71d 100644 --- a/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php @@ -99,9 +99,6 @@ protected function createQueue(string $name): InteropQueue return new RdKafkaTopic($name); } - /** - * @return RdKafkaTopic - */ protected function createTopic(string $name): RdKafkaTopic { return new RdKafkaTopic($name); diff --git a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php b/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php index 11bbf730d..47bf182c2 100644 --- a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php +++ b/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php @@ -24,8 +24,7 @@ protected function createContext() } /** - * @param Context $context - * @param string $queueName + * @param string $queueName * * @return Queue */ diff --git a/pkg/rdkafka/Tests/JsonSerializerTest.php b/pkg/rdkafka/Tests/JsonSerializerTest.php index d4db377d3..d10479def 100644 --- a/pkg/rdkafka/Tests/JsonSerializerTest.php +++ b/pkg/rdkafka/Tests/JsonSerializerTest.php @@ -39,7 +39,7 @@ public function testThrowIfFailedToEncodeMessageToJson() $resource = fopen(__FILE__, 'r'); - //guard + // guard $this->assertIsResource($resource); $message = new RdKafkaMessage('theBody', ['aProp' => $resource]); diff --git a/pkg/rdkafka/Tests/RdKafkaConsumerTest.php b/pkg/rdkafka/Tests/RdKafkaConsumerTest.php index 627831982..4f2b806c6 100644 --- a/pkg/rdkafka/Tests/RdKafkaConsumerTest.php +++ b/pkg/rdkafka/Tests/RdKafkaConsumerTest.php @@ -195,7 +195,7 @@ public function testShouldReceiveFromQueueAndReturnMessageIfMessageInQueue() { $destination = new RdKafkaTopic('dest'); - $expectedMessage = new RdKafkaMessage('theBody', ['foo' => 'fooVal'], ['bar' => 'barVal']); + $expectedMessage = new RdKafkaMessage('theBody', ['foo' => 'fooVal'], ['bar' => 'barVal']); $kafkaMessage = new Message(); $kafkaMessage->err = RD_KAFKA_RESP_ERR_NO_ERROR; @@ -260,7 +260,7 @@ public function testShouldAllowGetPreviouslySetSerializer() $expectedSerializer = $this->createSerializerMock(); - //guard + // guard $this->assertNotSame($consumer->getSerializer(), $expectedSerializer); $consumer->setSerializer($expectedSerializer); diff --git a/pkg/rdkafka/Tests/RdKafkaProducerTest.php b/pkg/rdkafka/Tests/RdKafkaProducerTest.php index eec4b364e..ecfa4c6fc 100644 --- a/pkg/rdkafka/Tests/RdKafkaProducerTest.php +++ b/pkg/rdkafka/Tests/RdKafkaProducerTest.php @@ -169,7 +169,7 @@ public function testShouldAllowGetPreviouslySetSerializer() $expectedSerializer = $this->createSerializerMock(); - //guard + // guard $this->assertNotSame($producer->getSerializer(), $expectedSerializer); $producer->setSerializer($expectedSerializer); diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php index afe344ae1..9a969d420 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php @@ -8,6 +8,7 @@ /** * @group functional + * * @retry 5 */ class RdKafkaSendToAndReceiveFromTopicTest extends SendToAndReceiveFromTopicSpec From 80cb92aa3eaceb8693b2bbbe12da72c245e6b039 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 20 Mar 2023 16:59:18 +0200 Subject: [PATCH 09/15] Remove rdkafka group from CI matrix --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7ea3c0bb..3a324886a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,14 +126,13 @@ jobs: php: ['7.4', '8.0', '8.1'] # same as in the container symfony_version: ['5.4.*', '6.2.*'] dependencies: ['--prefer-lowest', '--prefer-dist'] - rdkafka_action: ['exclude-group', 'group'] exclude: - php: '7.4' symfony_version: '6.2.*' - php: '8.0' symfony_version: '6.2.*' - name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}, deps=${{ matrix.dependencies }} + name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }} steps: - uses: actions/checkout@v2 From 0b6dff350eb121b0f801034a81494993228b743c Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 20 Mar 2023 17:41:04 +0200 Subject: [PATCH 10/15] Fix gearman skipping expressions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a324886a..af5814ffb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,7 +169,7 @@ jobs: # TODO: convert these two steps into one w/o excludes when Gearman extension gets a release for PHP 8.1 # See https://github.com/php/pecl-networking-gearman/issues/16 - run: bin/test.sh - if: ${{ matrix.php }} != '8.1' + if: ${{ matrix.php != '8.1' }} - run: bin/test.sh --exclude-group=gearman - if: ${{ matrix.php }} == '8.1' + if: ${{ matrix.php == '8.1' }} From 37be56508bbcd8db5e16dfe5868291adc5347299 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 21 Mar 2023 12:35:53 +0200 Subject: [PATCH 11/15] Bump doctrine packages --- composer.json | 7 ++++--- pkg/dbal/composer.json | 2 +- pkg/enqueue-bundle/composer.json | 2 +- pkg/job-queue/composer.json | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index d2874af50..119908e4f 100644 --- a/composer.json +++ b/composer.json @@ -26,8 +26,8 @@ "psr/container": "^1.1 || ^2.0", "makasim/temp-file": "^0.2", "google/cloud-pubsub": "^1.4.3", - "doctrine/orm": "^2.7.4", - "doctrine/persistence": "^1.3.3|^2.0", + "doctrine/orm": "^2.10", + "doctrine/persistence": "^2.0", "mongodb/mongodb": "^1.2", "pda/pheanstalk": "^3.1", "aws/aws-sdk-php": "^3.155", @@ -65,7 +65,7 @@ "symfony/framework-bundle": "^5.4|^6.0", "symfony/yaml": "^5.4|^6.0", "empi89/php-amqp-stubs": "*@dev", - "doctrine/doctrine-bundle": "^2.0", + "doctrine/doctrine-bundle": "^2.3.2", "doctrine/mongodb-odm-bundle": "^3.5|^4.3", "alcaeus/mongo-php-adapter": "^1.0", "kwn/php-rdkafka-stubs": "^2.0.3", @@ -136,3 +136,4 @@ } } } + diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json index 0e05824c6..cf7bfb97a 100644 --- a/pkg/dbal/composer.json +++ b/pkg/dbal/composer.json @@ -9,7 +9,7 @@ "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "doctrine/dbal": "^2.12|^3.1", - "doctrine/persistence": "^1.3.3|^2.0", + "doctrine/persistence": "^2.0", "ramsey/uuid": "^3.5|^4" }, "require-dev": { diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index 618b4ea7a..2af8a0f7c 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -36,7 +36,7 @@ "enqueue/async-event-dispatcher": "0.10.x-dev", "enqueue/async-command": "0.10.x-dev", "php-amqplib/php-amqplib": "^3.0", - "doctrine/doctrine-bundle": "^2.0", + "doctrine/doctrine-bundle": "^2.3.2", "doctrine/mongodb-odm-bundle": "^3.5|^4.3", "alcaeus/mongo-php-adapter": "^1.0", "symfony/browser-kit": "^5.4|^6.0", diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index 5fafab868..4856a0e24 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -10,13 +10,13 @@ "enqueue/enqueue": "^0.10", "enqueue/null": "^0.10", "queue-interop/queue-interop": "^0.8", - "doctrine/orm": "~2.7.4 | ^2.8", + "doctrine/orm": "^2.10", "doctrine/dbal": "^2.12 | ^3.0" }, "require-dev": { "phpunit/phpunit": "^9.5", "enqueue/test": "0.10.x-dev", - "doctrine/doctrine-bundle": "^2.0", + "doctrine/doctrine-bundle": "^2.3.2", "symfony/browser-kit": "^5.4|^6.0", "symfony/expression-language": "^5.4|^6.0", "symfony/framework-bundle": "^5.4|^6.0", From 322d0fe4f7a2ec8050ddd26785b56b8c6aff9a88 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 21 Mar 2023 13:30:52 +0200 Subject: [PATCH 12/15] Require symfony/validator in the bundle tests --- composer.json | 1 + pkg/enqueue-bundle/composer.json | 1 + 2 files changed, 2 insertions(+) diff --git a/composer.json b/composer.json index 119908e4f..5c346cd5e 100644 --- a/composer.json +++ b/composer.json @@ -63,6 +63,7 @@ "symfony/http-kernel": "^5.4|^6.0", "symfony/filesystem": "^5.4|^6.0", "symfony/framework-bundle": "^5.4|^6.0", + "symfony/validator": "^5.4|^6.0", "symfony/yaml": "^5.4|^6.0", "empi89/php-amqp-stubs": "*@dev", "doctrine/doctrine-bundle": "^2.3.2", diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index 2af8a0f7c..7ee50c269 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -41,6 +41,7 @@ "alcaeus/mongo-php-adapter": "^1.0", "symfony/browser-kit": "^5.4|^6.0", "symfony/expression-language": "^5.4|^6.0", + "symfony/validator": "^5.4|^6.0", "symfony/yaml": "^5.4|^6.0" }, "suggest": { From 178ebda8b649d408d5cd6573e85e2b70b6c87d54 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 21 Mar 2023 14:12:14 +0200 Subject: [PATCH 13/15] Try removing the locale_aware_listener from bundle test fixture app --- pkg/enqueue-bundle/Tests/Functional/App/config/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml b/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml index 0a33b27a7..d3ca2a37f 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml +++ b/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml @@ -126,6 +126,3 @@ services: class: 'Enqueue\Bundle\Tests\Functional\App\AsyncListener' public: true arguments: ['@enqueue.client.default.producer', '@enqueue.events.registry'] - - locale_aware_listener: - public: true From 428e8785459355582146c8b85ccf5b4f5ce5d4bc Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 21 Mar 2023 17:12:07 +0200 Subject: [PATCH 14/15] Bump orm to one depending on lexer working correctly on PHP 8.1 --- composer.json | 2 +- pkg/job-queue/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 5c346cd5e..b6f0be530 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "psr/container": "^1.1 || ^2.0", "makasim/temp-file": "^0.2", "google/cloud-pubsub": "^1.4.3", - "doctrine/orm": "^2.10", + "doctrine/orm": "^2.12", "doctrine/persistence": "^2.0", "mongodb/mongodb": "^1.2", "pda/pheanstalk": "^3.1", diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index 4856a0e24..55d37d5da 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -10,7 +10,7 @@ "enqueue/enqueue": "^0.10", "enqueue/null": "^0.10", "queue-interop/queue-interop": "^0.8", - "doctrine/orm": "^2.10", + "doctrine/orm": "^2.12", "doctrine/dbal": "^2.12 | ^3.0" }, "require-dev": { From 66e161fbef60289ed3b5bf1a6fedde3cbf10ed71 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Fri, 17 Feb 2023 20:28:49 +0200 Subject: [PATCH 15/15] Add PHP 8.2, skip gearman too --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af5814ffb..d3319ca9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.4', '8.0', '8.1'] + php: ['7.4', '8.0', '8.1', '8.2'] symfony_version: ['5.4.*', '6.2.*'] dependencies: ['--prefer-lowest', '--prefer-dist'] exclude: @@ -123,7 +123,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.4', '8.0', '8.1'] # same as in the container + php: ['7.4', '8.0', '8.1', '8.2'] # same as in the container symfony_version: ['5.4.*', '6.2.*'] dependencies: ['--prefer-lowest', '--prefer-dist'] exclude: @@ -169,7 +169,7 @@ jobs: # TODO: convert these two steps into one w/o excludes when Gearman extension gets a release for PHP 8.1 # See https://github.com/php/pecl-networking-gearman/issues/16 - run: bin/test.sh - if: ${{ matrix.php != '8.1' }} + if: ${{ matrix.php != '8.1' && matrix.php != '8.2' }} - run: bin/test.sh --exclude-group=gearman - if: ${{ matrix.php == '8.1' }} + if: ${{ matrix.php == '8.1' && matrix.php != '8.2' }}