diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index b9a8666cbcb4..38f432c4b796 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -59,9 +59,7 @@ jobs: - '8.2' - '8.3' - '8.4' - include: - - php-version: '8.5' - composer-option: '--ignore-platform-req=php' + - '8.5' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -101,8 +99,6 @@ jobs: - php-version: '8.2' db-platform: MySQLi mysql-version: '5.7' - - php-version: '8.5' - composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -130,9 +126,7 @@ jobs: - '8.2' - '8.3' - '8.4' - include: - - php-version: '8.5' - composer-option: '--ignore-platform-req=php' + - '8.5' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -158,9 +152,7 @@ jobs: - '8.2' - '8.3' - '8.4' - include: - - php-version: '8.5' - composer-option: '--ignore-platform-req=php' + - '8.5' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: diff --git a/composer.json b/composer.json index 2c71f8e640e9..22a86d7664a9 100644 --- a/composer.json +++ b/composer.json @@ -91,8 +91,7 @@ "CodeIgniter\\ComposerScripts::postUpdate" ], "post-autoload-dump": [ - "@php -r \"if (PHP_VERSION_ID >= 80500) { echo '@todo Remove \"--ignore-platform-req=php\" once deps catch up.', PHP_EOL; }\"", - "@composer update --ansi --working-dir=utils --ignore-platform-req=php" + "@composer update --ansi --working-dir=utils" ], "analyze": [ "Composer\\Config::disableProcessTimeout",