Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump symfony from 6.0 to 6.4 and add support for 7.0 #1326

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*'
Comment on lines -83 to -91
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to keep exclude for SF 6.4 and SF 7, because

  • SF 6.4 doesn't work on php 7.4 and 8.0
  • SF 7 doesn't work on php 7.4, 8.0 and 8.1


name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}

Expand Down Expand Up @@ -128,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 }}

Expand Down
24 changes: 12 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions pkg/async-command/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions pkg/async-event-dispatcher/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions pkg/enqueue-bundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions pkg/enqueue/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions pkg/fs/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"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": {
"phpunit/phpunit": "^9.5",
"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",
Expand Down
8 changes: 4 additions & 4 deletions pkg/job-queue/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions pkg/simple-client/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"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",
"enqueue/test": "0.10.x-dev",
"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",
Expand Down
Loading