From 183d2a617f4ae458c4d2fdb679956dbb261db7f5 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Fri, 20 Mar 2026 11:38:59 +0100
Subject: [PATCH 1/2] Fix Laravel build for PHP 8.2

Laravel 13.x dropped support for PHP 8.2. Fall back to 12.x for 8.2.

Closes GH-21473
---
 .github/matrix.php               | 1 +
 .github/workflows/test-suite.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/matrix.php b/.github/matrix.php
index 2ce59cb657b51..dd4c8f748a2e4 100644
--- a/.github/matrix.php
+++ b/.github/matrix.php
@@ -81,6 +81,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
             ? ['type' => ['asan', 'verify_type_inference']]
             : ['type' => ['asan']];
         $jobs['COMMUNITY']['config']['symfony_version'] = version_compare($php_version, '8.4', '>=') ? '8.1' : '7.4';
+        $jobs['COMMUNITY']['config']['laravel_version'] = version_compare($php_version, '8.3', '>=') ? '13.x' : '12.x';
     }
     if (($all_jobs && $ref === 'master') || $test_coverage) {
         $jobs['COVERAGE'] = true;
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index 83aae655a3c36..8d254015e6c42 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -506,7 +506,7 @@ jobs:
       - name: Test Laravel
         if: ${{ !cancelled() }}
         run: |
-          git clone https://github.com/laravel/framework.git --depth=1
+          git clone https://github.com/laravel/framework.git --depth=1 --branch="${{ fromJson(inputs.branch).jobs.COMMUNITY.config.laravel_version }}"
           cd framework
           git rev-parse HEAD
           php /usr/bin/composer install --no-progress --ignore-platform-req=php+

From 272cf1fb2d161bfbd5bf544cdc923a31ce093ac4 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Fri, 20 Mar 2026 13:32:42 +0100
Subject: [PATCH 2/2] Use default branch for symfony/laravel when possible

This way we don't have to keep bumping when new branches release, we just need
to pin to old versions when incompatibilities pop up.
---
 .github/matrix.php               | 10 ++++++++--
 .github/workflows/test-suite.yml |  6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/matrix.php b/.github/matrix.php
index dd4c8f748a2e4..dec8c7d249c68 100644
--- a/.github/matrix.php
+++ b/.github/matrix.php
@@ -80,8 +80,14 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
         $jobs['COMMUNITY']['matrix'] = version_compare($php_version, '8.4', '>=')
             ? ['type' => ['asan', 'verify_type_inference']]
             : ['type' => ['asan']];
-        $jobs['COMMUNITY']['config']['symfony_version'] = version_compare($php_version, '8.4', '>=') ? '8.1' : '7.4';
-        $jobs['COMMUNITY']['config']['laravel_version'] = version_compare($php_version, '8.3', '>=') ? '13.x' : '12.x';
+        $jobs['COMMUNITY']['config']['symfony_version'] = match (true) {
+            version_compare($php_version, '8.3', '<=') => '7.4',
+            default => '',
+        };
+        $jobs['COMMUNITY']['config']['laravel_version'] = match (true) {
+            version_compare($php_version, '8.2', '<=') => '12.x',
+            default => '',
+        };
     }
     if (($all_jobs && $ref === 'master') || $test_coverage) {
         $jobs['COVERAGE'] = true;
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index 8d254015e6c42..9eeff1455f8f9 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -506,7 +506,8 @@ jobs:
       - name: Test Laravel
         if: ${{ !cancelled() }}
         run: |
-          git clone https://github.com/laravel/framework.git --depth=1 --branch="${{ fromJson(inputs.branch).jobs.COMMUNITY.config.laravel_version }}"
+          branch=${{ fromJson(inputs.branch).jobs.COMMUNITY.config.laravel_version }}
+          git clone https://github.com/laravel/framework.git --depth=1 ${branch:+--branch="$branch"}
           cd framework
           git rev-parse HEAD
           php /usr/bin/composer install --no-progress --ignore-platform-req=php+
@@ -551,7 +552,8 @@ jobs:
       - name: Test Symfony
         if: ${{ !cancelled() }}
         run: |
-          git clone https://github.com/symfony/symfony.git --depth=1 --branch="${{ fromJson(inputs.branch).jobs.COMMUNITY.config.symfony_version }}"
+          branch=${{ fromJson(inputs.branch).jobs.COMMUNITY.config.symfony_version }}
+          git clone https://github.com/symfony/symfony.git --depth=1 ${branch:+--branch="$branch"}
           cd symfony
           git rev-parse HEAD
           php /usr/bin/composer install --no-progress --ignore-platform-req=php+