Skip to content

Commit 6ddf948

Browse files
committed
Fix using include
1 parent 54084d0 commit 6ddf948

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.github/workflows/test-coding-standards.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ jobs:
2929
matrix:
3030
php-version:
3131
- '8.1'
32-
- '8.5'
32+
include:
33+
- php-version: '8.5'
34+
composer-option: '--ignore-platform-req=php'
3335

3436
steps:
3537
- name: Checkout base branch for PR
@@ -61,7 +63,7 @@ jobs:
6163
${{ runner.os }}-
6264
6365
- name: Install dependencies
64-
run: composer update --ansi --no-interaction
66+
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
6567

6668
- name: Run lint
6769
run: composer cs

.github/workflows/test-rector.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,17 @@ permissions:
4040

4141
jobs:
4242
build:
43-
name: PHP ${{ matrix.php-versions }} Analyze code (Rector)
43+
name: PHP ${{ matrix.php-version }} Analyze code (Rector)
4444
runs-on: ubuntu-22.04
4545
strategy:
4646
fail-fast: false
4747
matrix:
48-
php-versions: ['8.1', '8.5']
48+
php-version:
49+
- '8.1'
50+
include:
51+
- php-version: '8.5'
52+
composer-option: '--ignore-platform-req=php'
53+
4954
steps:
5055
- name: Checkout base branch for PR
5156
if: github.event_name == 'pull_request'
@@ -59,7 +64,7 @@ jobs:
5964
- name: Setup PHP
6065
uses: shivammathur/setup-php@v2
6166
with:
62-
php-version: ${{ matrix.php-versions }}
67+
php-version: ${{ matrix.php-version }}
6368
extensions: intl
6469

6570
- name: Use latest Composer
@@ -79,7 +84,7 @@ jobs:
7984
restore-keys: ${{ runner.os }}-composer-
8085

8186
- name: Install dependencies
82-
run: composer update --ansi --no-interaction
87+
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
8388

8489
- name: Rector Cache
8590
uses: actions/cache@v4

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
"CodeIgniter\\ComposerScripts::postUpdate"
9090
],
9191
"post-autoload-dump": [
92+
"@php -r \"if (PHP_VERSION_ID >= 80500) { echo '@todo Remove `--ignore-platform-req=php` once deps catch up.', PHP_EOL; }\"",
9293
"@composer update --ansi --working-dir=utils --ignore-platform-req=php"
9394
],
9495
"analyze": [

0 commit comments

Comments
 (0)