Skip to content

Commit 7dc9a7e

Browse files
yoanmyoanm
authored
[BC] Add sf 7.0 and drop 4.4 (#115)
1 parent f157fcd commit 7dc9a7e

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,28 @@ jobs:
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)
6565
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
66-
- job-name: Up to date versions - Sf 5.4 case
66+
- job-name: Up to date versions - Sf 6.4 case
6767
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
68-
symfony-version: '5.4'
68+
symfony-version: '6.4'
6969
# 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"' || '' }}
70+
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
7271
- job-name: Bare minimum # => Lowest versions allowed by composer config
7372
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
7473
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
74+
- job-name: Bare minimum - Sf 6.4 case
7975
# 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 }}
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 PHP migration # => 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 }}
8181
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
8282
- job-name: Late Symfony migration # => Lowest symfony version with highest php version allowed by composer config
8383
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
8484
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
8585
# 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'
86+
# Fix - symfony/yaml => Avoid issue between symfony/yaml and symfony/framework-bundle (not compatible with some versions due to incomplete function signatures)
87+
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"' || '' }}
8788
steps:
8889
- name: Check out code
8990
uses: actions/checkout@v5
@@ -251,20 +252,19 @@ jobs:
251252
php-version: ${{ needs.fetch-supported-versions.outputs.php-next }}
252253
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-min }}
253254
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
254-
pkg-extra-constraints: behat/gherkin:~4.12.0
255+
# Fix - symfony/yaml => Avoid issue between symfony/yaml and symfony/framework-bundle (not compatible with some versions due to incomplete function signatures)
256+
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-min == '5.4' && needs.fetch-supported-versions.outputs.php-next == '8.5' ) && 'symfony/yaml:~6.4.0' || '' }}
255257
- job-name: Symfony with highest supported PHP version
256258
php-version: ${{ needs.fetch-supported-versions.outputs.php-max }}
257259
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
258260
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
259-
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
260-
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' || '' }}
261+
pkg-extra-constraints: behat/gherkin:~4.12.0
261262
- job-name: Symfony with lowest supported PHP version
262-
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
263-
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 }}
263+
# Fix - Sf 7.1 require php 8.2 minimum !
264+
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 }}
264265
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
265266
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
266-
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
267-
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' || '' }}
267+
pkg-extra-constraints: behat/gherkin:~4.12.0
268268

269269
steps:
270270
- name: Check out code

‎.github/workflows/supported-versions.json‎

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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
"require": {
3333
"php": "^8.0",
3434
"psr/container": "^1.0",
35-
"symfony/config": "^4.4 || ^5.4 || ^6.0",
36-
"symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
37-
"symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.0",
38-
"symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0",
39-
"symfony/http-foundation": "^4.4 || ^5.4 || ^6.0",
40-
"symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
35+
"symfony/config": "^5.4 || ^6.4 || ^7.0",
36+
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
37+
"symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
38+
"symfony/event-dispatcher-contracts": "^2.0 || ^3.0",
39+
"symfony/http-foundation": "^5.4 || ^6.4 || ^7.0",
40+
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
4141
"yoanm/jsonrpc-server-sdk": "^3.3"
4242
},
4343
"require-dev": {
@@ -50,8 +50,8 @@
5050
"phpunit/php-code-coverage": "^9.2.4",
5151
"phpunit/phpunit": "^9.0",
5252
"squizlabs/php_codesniffer": "^3.5",
53-
"symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0",
54-
"symfony/routing": "^4.4 || ^5.4 || ^6.0",
53+
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
54+
"symfony/routing": "^5.4 || ^6.4 || ^7.0",
5555
"yoanm/php-unit-extended": "^2.0"
5656
},
5757
"config": {

‎src/DependencyInjection/Configuration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Configuration implements ConfigurationInterface
88
{
99
const DEFAULT_ENDPOINT = '/json-rpc';
1010

11-
public function getConfigTreeBuilder()
11+
public function getConfigTreeBuilder(): TreeBuilder
1212
{
1313
$treeBuilder = new TreeBuilder(JsonRpcHttpServerExtension::EXTENSION_IDENTIFIER);
1414

0 commit comments

Comments
 (0)