Skip to content

Commit 59cbed5

Browse files
authored
refactor: remove ignore-platform-req (#9847)
* refactor: remove `ignore-platform-req` * Remove ignore-platform-req=php from composer update * Remove PHP version check from composer.json Removed a PHP version check from post-autoload-dump command.
1 parent 53a4b41 commit 59cbed5

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

.github/workflows/test-phpunit.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ jobs:
5959
- '8.2'
6060
- '8.3'
6161
- '8.4'
62-
include:
63-
- php-version: '8.5'
64-
composer-option: '--ignore-platform-req=php'
62+
- '8.5'
6563

6664
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
6765
with:
@@ -101,8 +99,6 @@ jobs:
10199
- php-version: '8.2'
102100
db-platform: MySQLi
103101
mysql-version: '5.7'
104-
- php-version: '8.5'
105-
composer-option: '--ignore-platform-req=php'
106102

107103
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
108104
with:
@@ -130,9 +126,7 @@ jobs:
130126
- '8.2'
131127
- '8.3'
132128
- '8.4'
133-
include:
134-
- php-version: '8.5'
135-
composer-option: '--ignore-platform-req=php'
129+
- '8.5'
136130

137131
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
138132
with:
@@ -158,9 +152,7 @@ jobs:
158152
- '8.2'
159153
- '8.3'
160154
- '8.4'
161-
include:
162-
- php-version: '8.5'
163-
composer-option: '--ignore-platform-req=php'
155+
- '8.5'
164156

165157
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
166158
with:

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@
9191
"CodeIgniter\\ComposerScripts::postUpdate"
9292
],
9393
"post-autoload-dump": [
94-
"@php -r \"if (PHP_VERSION_ID >= 80500) { echo '@todo Remove \"--ignore-platform-req=php\" once deps catch up.', PHP_EOL; }\"",
95-
"@composer update --ansi --working-dir=utils --ignore-platform-req=php"
94+
"@composer update --ansi --working-dir=utils"
9695
],
9796
"analyze": [
9897
"Composer\\Config::disableProcessTimeout",

0 commit comments

Comments
 (0)