kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-15 01:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '1.12' into 1.13

Browse source 
* 1.12:
  Exclude PHP 8.0/Symfony 6.4 from workflows' matrixes
  [Maintenance] Fix postgres behats
  Fix product name's casing in the Behat scenario
  Add the sylius-labs/suite-tags-extension package
  [Dependencies] Change possible versions of doctrine/persistence
  [CI] Update Symfony versions in build
This commit is contained in:
Grzegorz Sadowski 2023-12-05 12:57:17 +01:00
commit df9c44fc9e
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
4 changed files with 53 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci_e2e-custom.yaml vendored
View file

@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
php: [ "8.1" ]
symfony: [ "^6.3" ]
symfony: [ "^6.4" ]
mysql: [ "8.0" ]
env:

2
.github/workflows/ci_e2e-unstable.yaml vendored
View file

@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
php: [ "8.1" ]
symfony: [ "^6.3" ]
symfony: [ "^6.4" ]
mysql: [ "8.0" ]
env:

59
.github/workflows/matrix.json vendored
View file

@ -9,7 +9,7 @@
},
{
"php": "8.2",
"symfony": "^6.0",
"symfony": "^6.4",
"api-platform": "^2.7.10"
}
]
@ -23,8 +23,9 @@
},
{
"php": "8.2",
"symfony": "^6.0",
"mariadb": "10.4.10"
"symfony": "^6.4",
"mariadb": "10.4.10",
"dbal": "^3.0"
}
]
},
@ -39,7 +40,7 @@
},
{
"php": "8.2",
"symfony": "^6.0",
"symfony": "^6.4",
"api-platform": "^2.7.10",
"mysql": "8.0",
"twig": "^3.3"
@ -55,7 +56,7 @@
},
{
"php": "8.2",
"symfony": "^6.0",
"symfony": "^6.4",
"postgres": "14.6"
}
]
@ -68,7 +69,7 @@
},
{
"php": "8.2",
"symfony": "^6.0"
"symfony": "^6.4"
}
]
},
@ -84,17 +85,29 @@
"full": {
"static-checks": {
"php": [ "8.0", "8.1", "8.2" ],
"symfony": [ "^5.4", "^6.0" ],
"api-platform": [ "^2.7.10" ]
"symfony": [ "^5.4", "^6.4" ],
"api-platform": [ "^2.7.10" ],
"exclude": [
{
"php": "8.0",
"symfony": "^6.4"
}
]
},
"e2e-mariadb": {
"php": [ "8.0", "8.1", "8.2" ],
"symfony": [ "^5.4", "^6.0" ],
"mariadb": [ "10.4.10" ]
"symfony": [ "^5.4", "^6.4" ],
"mariadb": [ "10.4.10" ],
"exclude": [
{
"php": "8.0",
"symfony": "^6.4"
}
]
},
"e2e-mysql": {
"php": [ "8.0", "8.1", "8.2" ],
"symfony": [ "^5.4", "^6.0" ],
"symfony": [ "^5.4", "^6.4" ],
"api-platform": [ "^2.7.10" ],
"mysql": [ "5.7", "8.0" ],
"twig": [ "^3.3" ],
@ -106,16 +119,34 @@
"mysql": "5.7",
"twig": "^2.12"
}
],
"exclude": [
{
"php": "8.0",
"symfony": "^6.4"
}
]
},
"e2e-pgsql": {
"php": [ "8.0", "8.1", "8.2" ],
"symfony": [ "^5.4", "^6.0" ],
"postgres": [ "13.9", "14.6" ]
"symfony": [ "^5.4", "^6.4" ],
"postgres": [ "13.9", "14.6" ],
"exclude": [
{
"php": "8.0",
"symfony": "^6.4"
}
]
},
"packages": {
"php": [ "8.0", "8.1", "8.2" ],
"symfony": [ "^5.4", "^6.0" ]
"symfony": [ "^5.4", "^6.4" ],
"exclude": [
{
"php": "8.0",
"symfony": "^6.4"
}
]
},
"packages-swiftmailer": {
"php": [ "8.0", "8.1" ],

12
composer.json
View file

@ -42,7 +42,7 @@
"doctrine/inflector": "^1.4 || ^2.0",
"doctrine/migrations": "^3.5.5",
"doctrine/orm": "^2.13",
"doctrine/persistence": "^2.3",
"doctrine/persistence": "^2.3 || ^3.0",
"egulias/email-validator": "^3.1",
"enshrined/svg-sanitize": "^0.16",
"fakerphp/faker": "^1.10",
@ -228,12 +228,12 @@
"rector/rector": "^0.18.0",
"sylius-labs/coding-standard": "^4.2",
"sylius-labs/suite-tags-extension": "~0.1",
"symfony/browser-kit": "^5.4.21 || ^6.0",
"symfony/debug-bundle": "^5.4.21 || ^6.0",
"symfony/dotenv": "^5.4.21 || ^6.0",
"symfony/browser-kit": "^5.4.21 || ^6.4",
"symfony/debug-bundle": "^5.4.21 || ^6.4",
"symfony/dotenv": "^5.4.21 || ^6.4",
"symfony/flex": "^2.2",
"symfony/runtime": "^5.4.21 || ^6.0",
"symfony/web-profiler-bundle": "^5.4.21 || ^6.0",
"symfony/runtime": "^5.4.21 || ^6.4",
"symfony/web-profiler-bundle": "^5.4.21 || ^6.4",
"symplify/monorepo-builder": "^11.0"
},
"suggest": {