Skip to content

Commit d1c39a5

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Use default branch for symfony/laravel when possible Fix Laravel build for PHP 8.2
2 parents 5518095 + 272cf1f commit d1c39a5

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/matrix.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,14 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
8080
$jobs['COMMUNITY']['matrix'] = version_compare($php_version, '8.4', '>=')
8181
? ['type' => ['asan', 'verify_type_inference']]
8282
: ['type' => ['asan']];
83-
$jobs['COMMUNITY']['config']['symfony_version'] = version_compare($php_version, '8.4', '>=') ? '8.1' : '7.4';
83+
$jobs['COMMUNITY']['config']['symfony_version'] = match (true) {
84+
version_compare($php_version, '8.3', '<=') => '7.4',
85+
default => '',
86+
};
87+
$jobs['COMMUNITY']['config']['laravel_version'] = match (true) {
88+
version_compare($php_version, '8.2', '<=') => '12.x',
89+
default => '',
90+
};
8491
}
8592
if (($all_jobs && $ref === 'master') || $test_coverage) {
8693
$jobs['COVERAGE'] = true;

.github/workflows/test-suite.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,8 @@ jobs:
506506
- name: Test Laravel
507507
if: ${{ !cancelled() }}
508508
run: |
509-
git clone https://github.com/laravel/framework.git --depth=1
509+
branch=${{ fromJson(inputs.branch).jobs.COMMUNITY.config.laravel_version }}
510+
git clone https://github.com/laravel/framework.git --depth=1 ${branch:+--branch="$branch"}
510511
cd framework
511512
git rev-parse HEAD
512513
php /usr/bin/composer install --no-progress --ignore-platform-req=php+
@@ -551,7 +552,8 @@ jobs:
551552
- name: Test Symfony
552553
if: ${{ !cancelled() }}
553554
run: |
554-
git clone https://github.com/symfony/symfony.git --depth=1 --branch="${{ fromJson(inputs.branch).jobs.COMMUNITY.config.symfony_version }}"
555+
branch=${{ fromJson(inputs.branch).jobs.COMMUNITY.config.symfony_version }}
556+
git clone https://github.com/symfony/symfony.git --depth=1 ${branch:+--branch="$branch"}
555557
cd symfony
556558
git rev-parse HEAD
557559
php /usr/bin/composer install --no-progress --ignore-platform-req=php+

0 commit comments

Comments
 (0)