Skip to content

Commit 135ba06

Browse files
authored
Merge 309f60a into f9d80a1
2 parents f9d80a1 + 309f60a commit 135ba06

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/reusable-CI-workflow.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,22 @@ jobs:
6262
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
6363
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
6464
pkg-extra-constraints: behat/gherkin:~4.12.0
65-
- job-name: Up to date versions - Special case - Symfony 5.4
65+
- job-name: Up to date versions - Special case - Symfony 6.4
6666
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
67-
symfony-version: '5.4'
67+
symfony-version: '6.4'
6868
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
6969
# Fix - symfony/yaml - Avoid issue with Sf YAML 6.4+ and Framework bundle
7070
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '6.4' ) && 'symfony/yaml:~6.4.0' || '' }}
7171
- job-name: Bare minimum # => Lowest versions allowed by composer config
7272
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
7373
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
74-
- job-name: Bare minimum - Special case - Symfony 5.4
75-
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
76-
symfony-version: '5.4'
77-
- job-name: Late migration - PHP # => Highest symfony version with lowest php version allowed by composer config
74+
- job-name: Bare minimum - Special case - Symfony 6.4
7875
# Fix - Sf 6.4 require php 8.1 minimum !
79-
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '6.4' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.1' || needs.fetch-supported-versions.outputs.php-min }}
76+
php-version: ${{ ( needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.1' || needs.fetch-supported-versions.outputs.php-min }}
77+
symfony-version: '6.4'
78+
- job-name: Late migration - PHP # => Highest symfony version with lowest php version allowed by composer config
79+
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
80+
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
8081
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
8182
- job-name: Late migration - Symfony # => Lowest symfony version with highest php version allowed by composer config
8283
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"php": {"min": "8.0", "max": "8.4", "next": "8.5"},
3-
"symfony": {"min": "4.4", "max": "6.4", "next": "7.0"}
3+
"symfony": {"min": "5.4", "max": "7.0", "next": "7.1"}
44
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"require": {
3434
"php": "^8.0",
35-
"symfony/validator": "^4.4 || ^5.4 || ^6.0",
35+
"symfony/validator": "^5.4 || ^6.4 || ^7.0",
3636
"yoanm/jsonrpc-server-sdk": "^3.0"
3737
},
3838
"require-dev": {

0 commit comments

Comments
 (0)