Skip to content

Commit 91dbdb6

Browse files
authored
Merge pull request #273 from BitBagCommerce/bring-back-symfony-6.4-support
Bring back Symfony 6.4 support
2 parents 3bf8971 + f549aef commit 91dbdb6

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
php: [ "8.2", "8.3" ]
24-
symfony: [ "^7.1" ]
24+
symfony: [ "^6.4", "^7.1" ]
2525
sylius: [ "^2.0" ]
2626
node: [ "20.x" ]
27-
mysql: [ "8.0" ]
27+
mysql: [ "8.4" ]
2828
env:
2929
APP_ENV: test
3030
DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"

composer.json

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"php": "^8.2 || ^8.3",
88
"ext-json": "*",
99
"friendsofsymfony/elastica-bundle": "^6.0",
10-
"sylius/sylius": "~2.0.0",
11-
"symfony/property-access": "^7.1",
10+
"sylius/sylius": "^2.0",
11+
"symfony/property-access": "^6.4 || ^7.1",
1212
"symfony/webpack-encore-bundle": "^2.2"
1313
},
1414
"require-dev": {
@@ -38,24 +38,19 @@
3838
"robertfausk/behat-panther-extension": "^1.1",
3939
"sylius-labs/coding-standard": "^4.2",
4040
"sylius-labs/suite-tags-extension": "^0.2",
41-
"symfony/browser-kit": "^7.1",
42-
"symfony/debug-bundle": "^7.1",
43-
"symfony/dotenv": "7.1",
44-
"symfony/intl": "^7.1",
45-
"symfony/web-profiler-bundle": "^7.1"
46-
},
47-
"conflict": {
48-
"api-platform/core": "v2.7.17",
49-
"symfony/framework-bundle": "6.2.8"
41+
"symfony/browser-kit": "^6.4 || ^7.1",
42+
"symfony/debug-bundle": "^6.4 || ^7.1",
43+
"symfony/dotenv": "^6.4 || ^7.1",
44+
"symfony/intl": "^6.4 || ^7.1",
45+
"symfony/web-profiler-bundle": "^6.4 || ^7.1"
5046
},
5147
"config": {
5248
"sort-packages": true,
5349
"allow-plugins": {
5450
"composer/package-versions-deprecated": true,
5551
"dealerdirect/phpcodesniffer-composer-installer": true,
5652
"php-http/discovery": false,
57-
"phpstan/extension-installer": true,
58-
"symfony/thanks": true
53+
"phpstan/extension-installer": true
5954
}
6055
},
6156
"extra": {

0 commit comments

Comments
 (0)