Merge branch 'master' into simplesamlphp-2.6

tvdijen · tvdijen · commit b91b4e560cae · 2026-03-27T15:38:53.000+01:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -79,6 +79,15 @@ jobs:
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
+      - name: Get COMPOSER_ROOT_VERSION from composer.json branch alias
+        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" >> "$GITHUB_ENV"
+
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
@@ -141,6 +150,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" >> "$GITHUB_ENV"
+
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
@@ -184,6 +203,15 @@ jobs:
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
+      - name: Get COMPOSER_ROOT_VERSION from composer.json branch alias
+        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" >> "$GITHUB_ENV"
+
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
@@ -205,7 +233,8 @@ jobs:
           composer-unused \
             --excludePackage=simplesamlphp/simplesamlphp-assets-base \
             --excludePackage=symfony/expression-language \
-            --excludePackage=symfony/polyfill-intl-icu
+            --excludePackage=symfony/polyfill-intl-icu \
+            --excludePackage=symfony/yaml
 
       - name: PHP Code Sniffer
         run: vendor/bin/phpcs
@@ -248,6 +277,15 @@ jobs:
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
+      - name: Get COMPOSER_ROOT_VERSION from composer.json branch alias
+        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" >> "$GITHUB_ENV"
+
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
diff --git a/composer.json b/composer.json
@@ -97,6 +97,7 @@
         "symfony/translation-contracts": "~3.6",
         "symfony/twig-bridge": "~7.4",
         "symfony/var-exporter": "~7.4",
+        "symfony/yaml": "~7.4",
         "twig/intl-extra": "~3.21",
         "twig/twig": "~3.21"
     },
diff --git a/composer.lock b/composer.lock
