Merge e8bdf87 into f9d80a1

yoanm · web-flow · commit 16d9d1e8687e · 2025-09-03T09:20:42.000+02:00
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -7,11 +7,23 @@ on: # Build any PRs and main branch changes
       - opened
       - synchronize
     paths-ignore:
+      # >>> CI Pre-check
       # In case of updates to those workflows, they must be pre-checked by `pre-check-CI-updates.yml` rather than this workflow !
       # Any updates on those workflows are expected to be restricted to those workflows only ! (no update on code for instance)
       - '.github/workflows/pre-check-CI-updates.yml'
       - '.github/workflows/reusable-CI-workflow.yml'
       - '.github/workflows/reusable-coverage-upload-workflow.yml'
+      # <<< CI Pre-check
+      # >>> Irrelevant files (no impact whatsoever on this GHWorkflow)
+      - '.github/workflows/coverage-upload.yml' # Executed for on master (workflow_run), no impact here
+      - '.github/workflows/dependabot-PRs.yml' # Executed for dependabot PRs, no impact here
+      - '**/*.md'
+      - '**/LICENSE'
+      - '**/CODEOWNERS'
+      - '**/.remarkrc*'
+      - '**/.editorconfig'
+      - '**/.scrutinizer.yml'
+      # <<< Irrelevant files
   push:
     branches: [ master ]
   schedule:
diff --git a/.github/workflows/dependabot-PRs.yml b/.github/workflows/dependabot-PRs.yml
@@ -1,4 +1,4 @@
-name: PR auto-merge
+name: Dependabot PRs
 on: pull_request
 
 permissions:
diff --git a/.github/workflows/reusable-CI-workflow.yml b/.github/workflows/reusable-CI-workflow.yml
@@ -45,7 +45,7 @@ jobs:
           dependency: symfony
 
   tests:
-    name: ${{ matrix.job-name }}
+    name: PHP ${{ matrix.php-version }} & Sf ${{ matrix.symfony-version }} - ${{ matrix.job-name }}
     needs: [fetch-supported-versions]
     runs-on: ubuntu-latest
     permissions:
@@ -61,28 +61,28 @@ jobs:
             php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
             symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
             # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
-            pkg-extra-constraints: behat/gherkin:~4.12.0
-          - job-name: Up to date versions - Special case - Symfony 5.4
+            pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
+          - job-name: Up to date versions - Sf 6.4 case
             php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
-            symfony-version: '5.4'
+            symfony-version: '6.4'
             # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
-            # Fix - symfony/yaml - Avoid issue with Sf YAML 6.4+ and Framework bundle
-            pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '6.4' ) && 'symfony/yaml:~6.4.0' || '' }}
+            pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
           - job-name: Bare minimum # => Lowest versions allowed by composer config
             php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
             symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
-          - job-name: Bare minimum - Special case - Symfony 5.4
-            php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
-            symfony-version: '5.4'
-          - job-name: Late migration - PHP # => Highest symfony version with lowest php version allowed by composer config
+          - job-name: Bare minimum - Sf 6.4 case
             # Fix - Sf 6.4 require php 8.1 minimum !
-            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 }}
+            php-version: ${{ ( needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.1' || needs.fetch-supported-versions.outputs.php-min }}
+            symfony-version: '6.4'
+          - job-name: Late PHP migration # => Highest symfony version with lowest php version allowed by composer config
+            # Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
+            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 }}
             symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
-          - job-name: Late migration - Symfony # => Lowest symfony version with highest php version allowed by composer config
+          - job-name: Late Symfony migration # => Lowest symfony version with highest php version allowed by composer config
             php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
             symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
             # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
-            pkg-extra-constraints: behat/gherkin:~4.12.0
+            pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
     steps:
       - name: Check out code
         uses: actions/checkout@v5
@@ -120,8 +120,8 @@ jobs:
       - name: Build with PHP ${{ steps.setup-php.outputs.php-version }} & Symfony ${{ matrix.symfony-version }}
         run: |
           SF_CONSTRAINT="~${{ matrix.symfony-version }}.0"
-          composer require -W \
-            symfony/validator:${SF_CONSTRAINT} \
+          composer update --no-install --with-all-dependencies --minimal-changes \
+            --with "symfony/validator:${SF_CONSTRAINT}" \
             ${{ matrix.pkg-extra-constraints }} \
           && make build
 
@@ -202,8 +202,8 @@ jobs:
       - name: Build with PHP ${{ steps.setup-php.outputs.php-version }} & Symfony ${{ env.SYMFONY_VERSION }}
         run: |
           SF_CONSTRAINT="~${{ env.SYMFONY_VERSION }}.0"
-          composer require -W \
-            symfony/validator:${SF_CONSTRAINT} \
+          composer update --no-install --with-all-dependencies --minimal-changes \
+              --with "symfony/validator:${SF_CONSTRAINT}" \
           && make build
 
       - name: ComposerRequireChecker
@@ -214,7 +214,7 @@ jobs:
         uses: actions/dependency-review-action@v4
 
   nightly-tests:
-    name: Nightly - ${{ matrix.job-name }}
+    name: Nightly - PHP ${{ matrix.php-version }} & Sf ${{ matrix.symfony-version }} - ${{ matrix.job-name }}
     needs: [ fetch-supported-versions, tests ]
     if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'with-nightly-tests') ) }}
     runs-on: ubuntu-latest
@@ -227,29 +227,29 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - job-name: PHP - With highest supported Symfony versions
+          - job-name: PHP with highest supported Symfony versions
             php-version: ${{ needs.fetch-supported-versions.outputs.php-next }}
             symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-max }}
             # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
-            pkg-extra-constraints: behat/gherkin:~4.12.0
-          - job-name: PHP - With lowest supported Symfony versions
+            pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
+          - job-name: PHP with lowest supported Symfony versions
             php-version: ${{ needs.fetch-supported-versions.outputs.php-next }}
             symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-min }}
             # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
-            pkg-extra-constraints: behat/gherkin:~4.12.0
-          - job-name: Symfony - With highest supported PHP version
+            pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
+          - job-name: Symfony with highest supported PHP version
             php-version: ${{ needs.fetch-supported-versions.outputs.php-max }}
             symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
             # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
             # Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
-            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' || '' }}
-          - job-name: Symfony - With lowest supported PHP version
-            # Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
-            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 }}
+            pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
+          - job-name: Symfony with lowest supported PHP version
+            # Fix - symfony/validator  7.1 require php 8.2 minimum !
+            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 }}
             symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
             # Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
             # Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
-            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' || '' }}
+            pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
 
     steps:
       - name: Check out code
@@ -282,8 +282,8 @@ jobs:
         run: |
           SF_CONSTRAINT="~${{ matrix.symfony-version }}.0@dev"
           composer config minimum-stability dev \
-          && composer require -W \
-            symfony/validator:${SF_CONSTRAINT} \
+          && composer update --no-install --with-all-dependencies --minimal-changes \
+            --with "symfony/validator:${SF_CONSTRAINT}" \
             ${{ matrix.pkg-extra-constraints }} \
           && make build
 
diff --git a/.github/workflows/supported-versions.json b/.github/workflows/supported-versions.json
@@ -1,4 +1,4 @@
 {
     "php": {"min": "8.0", "max": "8.4", "next": "8.5"},
-    "symfony": {"min": "4.4", "max": "6.4", "next": "7.0"}
+    "symfony": {"min": "5.4", "max": "7.0", "next": "7.1"}
 }
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
   },
   "require": {
     "php": "^8.0",
-    "symfony/validator": "^4.4 || ^5.4 || ^6.0",
+    "symfony/validator": "^5.4 || ^6.4 || ^7.0",
     "yoanm/jsonrpc-server-sdk": "^3.0"
   },
   "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: PR auto-merge`
	`1`	`+name: Dependabot PRs`
`2`	`2`	`on: pull_request`
`3`	`3`
`4`	`4`	`permissions:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"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"}`
`4`	`4`	`}`