From cf3413487a14d4685f562c73ae71a530c28dd84b Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Fri, 15 Dec 2023 11:43:13 +0100 Subject: [PATCH 1/3] Bumpt symfony from 6.0 to 6.4 and add support for 7.0 --- composer.json | 24 ++++++++++++------------ pkg/async-command/composer.json | 14 +++++++------- pkg/async-event-dispatcher/composer.json | 12 ++++++------ pkg/enqueue-bundle/composer.json | 10 +++++----- pkg/enqueue/composer.json | 14 +++++++------- pkg/fs/composer.json | 6 +++--- pkg/job-queue/composer.json | 8 ++++---- pkg/simple-client/composer.json | 4 ++-- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/composer.json b/composer.json index 5c0108e27..e1e688dff 100644 --- a/composer.json +++ b/composer.json @@ -53,18 +53,18 @@ "phpunit/phpunit": "^9.5", "phpstan/phpstan": "^0.12", "queue-interop/queue-spec": "^0.6.2", - "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/validator": "^5.4|^6.0", - "symfony/yaml": "^5.4|^6.0", + "symfony/browser-kit": "^5.4|^6.4|^7.0", + "symfony/config": "^5.4|^6.4|^7.0", + "symfony/process": "^5.4|^6.4|^7.0", + "symfony/console": "^5.4|^6.4|^7.0", + "symfony/dependency-injection": "^5.4|^6.4|^7.0", + "symfony/event-dispatcher": "^5.4|^6.4|^7.0", + "symfony/expression-language": "^5.4|^6.4|^7.0", + "symfony/http-kernel": "^5.4|^6.4|^7.0", + "symfony/filesystem": "^5.4|^6.4|^7.0", + "symfony/framework-bundle": "^5.4|^6.4|^7.0", + "symfony/validator": "^5.4|^6.4|^7.0", + "symfony/yaml": "^5.4|^6.4|^7.0", "empi89/php-amqp-stubs": "*@dev", "doctrine/doctrine-bundle": "^2.3.2", "doctrine/mongodb-odm-bundle": "^3.5|^4.3", diff --git a/pkg/async-command/composer.json b/pkg/async-command/composer.json index 48fd6f089..4a2293139 100644 --- a/pkg/async-command/composer.json +++ b/pkg/async-command/composer.json @@ -9,16 +9,16 @@ "php": "^7.4|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/queue-interop": "^0.8", - "symfony/console": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0" + "symfony/console": "^5.4|^6.4|^7.0", + "symfony/process": "^5.4|^6.4|^7.0" }, "require-dev": { "phpunit/phpunit": "^9.5", - "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", + "symfony/dependency-injection": "^5.4|^6.4|^7.0", + "symfony/config": "^5.4|^6.4|^7.0", + "symfony/http-kernel": "^5.4|^6.4|^7.0", + "symfony/filesystem": "^5.4|^6.4|^7.0", + "symfony/yaml": "^5.4|^6.4|^7.0", "enqueue/null": "0.10.x-dev", "enqueue/fs": "0.10.x-dev", "enqueue/test": "0.10.x-dev" diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json index a2cef0d79..42e3aa7ea 100644 --- a/pkg/async-event-dispatcher/composer.json +++ b/pkg/async-event-dispatcher/composer.json @@ -9,15 +9,15 @@ "php": "^7.4|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/queue-interop": "^0.8", - "symfony/event-dispatcher": "^5.4|^6.0" + "symfony/event-dispatcher": "^5.4|^6.4|^7.0" }, "require-dev": { "phpunit/phpunit": "^9.5", - "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", + "symfony/dependency-injection": "^5.4|^6.4|^7.0", + "symfony/config": "^5.4|^6.4|^7.0", + "symfony/http-kernel": "^5.4|^6.4|^7.0", + "symfony/filesystem": "^5.4|^6.4|^7.0", + "symfony/yaml": "^5.4|^6.4|^7.0", "enqueue/null": "0.10.x-dev", "enqueue/fs": "0.10.x-dev", "enqueue/test": "0.10.x-dev" diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index 7ee50c269..79a84d705 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": "^7.4|^8.0", - "symfony/framework-bundle": "^5.4|^6.0", + "symfony/framework-bundle": "^5.4|^6.4|^7.0", "queue-interop/amqp-interop": "^0.8.2", "queue-interop/queue-interop": "^0.8", "enqueue/enqueue": "^0.10", @@ -39,10 +39,10 @@ "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", - "symfony/expression-language": "^5.4|^6.0", - "symfony/validator": "^5.4|^6.0", - "symfony/yaml": "^5.4|^6.0" + "symfony/browser-kit": "^5.4|^6.4|^7.0", + "symfony/expression-language": "^5.4|^6.4|^7.0", + "symfony/validator": "^5.4|^6.4|^7.0", + "symfony/yaml": "^5.4|^6.4|^7.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 0da00ee4b..60d086c51 100644 --- a/pkg/enqueue/composer.json +++ b/pkg/enqueue/composer.json @@ -18,11 +18,11 @@ "require-dev": { "phpunit/phpunit": "^9.5", "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", + "symfony/dependency-injection": "^5.4|^6.4|^7.0", + "symfony/config": "^5.4|^6.4|^7.0", + "symfony/event-dispatcher": "^5.4|^6.4|^7.0", + "symfony/http-kernel": "^5.4|^6.4|^7.0", + "symfony/yaml": "^5.4|^6.4|^7.0", "enqueue/amqp-ext": "0.10.x-dev", "enqueue/amqp-lib": "0.10.x-dev", "enqueue/amqp-bunny": "0.10.x-dev", @@ -43,8 +43,8 @@ }, "suggest": { "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", + "symfony/dependency-injection": "^5.4|^6.4|^7.0", + "symfony/config": "^5.4|^6.4|^7.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 b44900541..75f54cae1 100644 --- a/pkg/fs/composer.json +++ b/pkg/fs/composer.json @@ -9,7 +9,7 @@ "php": "^7.4|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", - "symfony/filesystem": "^5.4|^6.0", + "symfony/filesystem": "^5.4|^6.4|^7.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.4|^6.0", - "symfony/yaml": "^5.4|^6.0" + "symfony/dependency-injection": "^5.4|^6.4|^7.0", + "symfony/yaml": "^5.4|^6.4|^7.0" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index 55d37d5da..d28fcb9bf 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -17,10 +17,10 @@ "phpunit/phpunit": "^9.5", "enqueue/test": "0.10.x-dev", "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", - "symfony/yaml": "^5.4|^6.0" + "symfony/browser-kit": "^5.4|^6.4|^7.0", + "symfony/expression-language": "^5.4|^6.4|^7.0", + "symfony/framework-bundle": "^5.4|^6.4|^7.0", + "symfony/yaml": "^5.4|^6.4|^7.0" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json index 7cb07b6b3..c0c5b9731 100644 --- a/pkg/simple-client/composer.json +++ b/pkg/simple-client/composer.json @@ -10,7 +10,7 @@ "enqueue/enqueue": "^0.10", "queue-interop/amqp-interop": "^0.8.2", "queue-interop/queue-interop": "^0.8", - "symfony/config": "^5.4|^6.0" + "symfony/config": "^5.4|^6.4|^7.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.4|^6.0" + "symfony/yaml": "^5.4|^6.4|^7.0" }, "support": { "email": "opensource@forma-pro.com", From 4dbc797109b354b6adec682f472669babe68c371 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Fri, 15 Dec 2023 11:47:32 +0100 Subject: [PATCH 2/3] Update CI --- .github/workflows/ci.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c29d8430c..bfad05eee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,17 +78,8 @@ jobs: fail-fast: false matrix: php: ['7.4', '8.0', '8.1', '8.2'] - symfony_version: ['5.4.*', '6.2.*', '6.3.*'] + symfony_version: ['5.4.*', '6.4.*', '7.0.*'] dependencies: ['--prefer-lowest', '--prefer-dist'] - exclude: - - php: '7.4' - symfony_version: '6.2.*' - - php: '7.4' - symfony_version: '6.3.*' - - php: '8.0' - symfony_version: '6.2.*' - - php: '8.0' - symfony_version: '6.3.*' name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }} From 1c8d684d932adb259b6a00932a9ae7e429b68f0f Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Fri, 15 Dec 2023 11:49:00 +0100 Subject: [PATCH 3/3] Update CI again --- .github/workflows/ci.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bfad05eee..d9ff9f565 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,17 +119,8 @@ jobs: fail-fast: false matrix: php: ['7.4', '8.0', '8.1', '8.2'] # same as in the container - symfony_version: ['5.4.*', '6.2.*', '6.3.*'] + symfony_version: ['5.4.*', '6.4.*', '7.0.*'] dependencies: ['--prefer-lowest', '--prefer-dist'] - exclude: - - php: '7.4' - symfony_version: '6.2.*' - - php: '7.4' - symfony_version: '6.3.*' - - php: '8.0' - symfony_version: '6.2.*' - - php: '8.0' - symfony_version: '6.3.*' name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}