php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  Use default branch for symfony/laravel when possible
  Fix Laravel build for PHP 8.2
This commit is contained in:
Ilija Tovilo
2026-03-20 14:50:13 +01:00
parent 38cbbee4aa f134227e5d
commit e39b6b9697
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/matrix.php vendored
View File

@@ -80,7 +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']['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;

6
.github/workflows/test-suite.yml vendored
View File

@@ -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 }}
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+