Merge branch 'master' into release-3.x

Author: tvdijen

.github/workflows/php.yml

@@ -138,6 +138,16 @@ jobs:
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
 
+      - name: Get COMPOSER_ROOT_VERSION from composer.json branch alias
+        shell: bash
+        run: |
+            ROOT_VERSION=$(composer config extra.branch-alias.dev-master)
+            if [ -z "$ROOT_VERSION" ]; then
+              echo "Could not read extra.branch-alias.dev-master from composer.json" >&2
+              exit 1
+            fi
+            echo "COMPOSER_ROOT_VERSION=$ROOT_VERSION" >> "$env:GITHUB_ENV"
+
       - name: Cache composer dependencies
         uses: actions/cache@v6
         with:
@@ -151,7 +161,6 @@ jobs:
       - name: Run unit tests
         run: vendor/bin/phpunit --no-coverage
 
-
   quality:
     name: Quality control
     needs: [unit-tests-linux]