Skip to content

Commit 8975018

Browse files
committed
[BC] Add sf 7.0 and drop 4.4
1 parent eab9b7d commit 8975018

File tree

3 files changed

+36
-27
lines changed

3 files changed

+36
-27
lines changed

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

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,32 @@ jobs:
6262
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
6363
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
6464
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
65-
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
66-
- job-name: Up to date versions - Sf 5.4 case
65+
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
66+
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0' --with 'yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0' --with 'yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0'
67+
- job-name: Up to date versions - Sf 6.4 case
6768
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
68-
symfony-version: '5.4'
69+
symfony-version: '6.4'
6970
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
70-
# Fix - symfony/yaml - Avoid issue with Sf YAML 6.4+ and Framework bundle
71-
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0' ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '6.4' ) && '--with "symfony/yaml:~6.4.0"' || '' }}
71+
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
7272
- job-name: Bare minimum # => Lowest versions allowed by composer config
7373
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
7474
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
75-
- job-name: Bare minimum - Sf 5.4 case
76-
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
77-
symfony-version: '5.4'
78-
- job-name: Late PHP migration # => Highest symfony version with lowest php version allowed by composer config
75+
- job-name: Bare minimum - Sf 6.4 case
7976
# Fix - Sf 6.4 require php 8.1 minimum !
80-
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 }}
77+
php-version: ${{ ( needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.1' || needs.fetch-supported-versions.outputs.php-min }}
78+
symfony-version: '6.4'
79+
- job-name: Late PHP migration # => Highest symfony version with lowest php version allowed by composer config
80+
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
81+
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 }}
8182
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
83+
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
84+
pkg-extra-constraints: --with 'yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0' --with 'yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0'
8285
- job-name: Late Symfony migration # => Lowest symfony version with highest php version allowed by composer config
8386
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
8487
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
8588
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
86-
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
89+
# Fix - symfony/yaml => Avoid issue between symfony/yaml and symfony/framework-bundle (not compatible with some versions due to incomplete function signatures)
90+
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0' ${{ ( needs.fetch-supported-versions.outputs.symfony-min == '5.4' && needs.fetch-supported-versions.outputs.php-max == '8.4' ) && '--with "symfony/yaml:~6.4.0"' || '' }}
8791
steps:
8892
- name: Check out code
8993
uses: actions/checkout@v5
@@ -215,6 +219,7 @@ jobs:
215219
--with "symfony/config:${SF_CONSTRAINT}" \
216220
--with "symfony/dependency-injection:${SF_CONSTRAINT}" \
217221
--with "symfony/http-kernel:${SF_CONSTRAINT}" \
222+
--with 'yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0' --with 'yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0' \
218223
&& make build
219224
220225
- name: ComposerRequireChecker
@@ -242,25 +247,29 @@ jobs:
242247
php-version: ${{ needs.fetch-supported-versions.outputs.php-next }}
243248
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-max }}
244249
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
245-
pkg-extra-constraints: behat/gherkin:~4.12.0
250+
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
251+
pkg-extra-constraints: behat/gherkin:~4.12.0 yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0 yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0
246252
- job-name: PHP with lowest supported Symfony versions
247253
php-version: ${{ needs.fetch-supported-versions.outputs.php-next }}
248254
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-min }}
249255
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
250-
pkg-extra-constraints: behat/gherkin:~4.12.0
256+
# Fix - symfony/yaml => Avoid issue between symfony/yaml and symfony/framework-bundle (not compatible with some versions due to incomplete function signatures)
257+
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
258+
pkg-extra-constraints: behat/gherkin:~4.12.0 yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0 yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-min == '5.4' && needs.fetch-supported-versions.outputs.php-next == '8.5' ) && 'symfony/yaml:~6.4.0' || '' }}
251259
- job-name: Symfony with highest supported PHP version
252260
php-version: ${{ needs.fetch-supported-versions.outputs.php-max }}
253261
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
254262
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
255-
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
256-
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-max == '8.4' ) && 'symfony/framework-bundle:~7.0.0@dev' || '' }}
263+
# Fix - symfony/yaml => Avoid issue between symfony/yaml and symfony/framework-bundle (not compatible with some versions due to incomplete function signatures)
264+
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
265+
pkg-extra-constraints: behat/gherkin:~4.12.0 yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0 yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0
257266
- job-name: Symfony with lowest supported PHP version
258-
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
259-
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
267+
# Fix - Sf 7.1 require php 8.2 minimum !
268+
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.1' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
260269
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
261270
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
262-
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
263-
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && 'symfony/framework-bundle:~7.0.0@dev' || '' }}
271+
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
272+
pkg-extra-constraints: behat/gherkin:~4.12.0 yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0 yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0
264273

265274
steps:
266275
- name: Check out code
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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
},
3131
"require": {
3232
"php": "^8.0",
33-
"symfony/config": "^4.4 || ^5.4 || ^6.0",
34-
"symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
33+
"symfony/config": "^5.4 || ^6.4 || ^7.0",
34+
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
3535
"symfony/event-dispatcher-contracts": "^1.0 || ^2.0",
36-
"symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
36+
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
3737
"yoanm/jsonrpc-http-server-openapi-doc-sdk": "^v1.0",
3838
"yoanm/jsonrpc-server-doc-sdk": "^v1.0",
39-
"yoanm/symfony-jsonrpc-http-server-doc": "^1.1"
39+
"yoanm/symfony-jsonrpc-http-server-doc": "^1.1 || dev-feature/increase-supported-versions-sf7.0"
4040
},
4141
"require-dev": {
4242
"behat/behat": "^3.9.0,<=3.16.1",
@@ -48,9 +48,9 @@
4848
"phpunit/php-code-coverage": "^9.2.4",
4949
"phpunit/phpunit": "^9.0",
5050
"squizlabs/php_codesniffer": "^3.5",
51-
"symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.0",
52-
"symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0",
53-
"symfony/routing": "^4.4 || ^5.4 || ^6.0",
51+
"symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
52+
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
53+
"symfony/routing": "^5.4 || ^6.4 || ^7.0",
5454
"yoanm/php-unit-extended": "^2.0.2"
5555
},
5656
"config": {

0 commit comments

Comments
 (0)