diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml index d5e492710c7a..3805a8744c30 100644 --- a/.github/workflows/reusable-phpunit-test.yml +++ b/.github/workflows/reusable-phpunit-test.yml @@ -266,7 +266,7 @@ jobs: DB: ${{ inputs.db-platform }} TACHYCARDIA_MONITOR_GA: ${{ inputs.enable-profiling && 'enabled' || '' }} TERM: xterm-256color - continue-on-error: ${{ inputs.php-version == '8.5' }} + continue-on-error: ${{ inputs.php-version == '8.6' }} - name: Upload coverage results as artifact if: ${{ inputs.enable-artifact-upload }} diff --git a/.github/workflows/reusable-serviceless-phpunit-test.yml b/.github/workflows/reusable-serviceless-phpunit-test.yml index 60186d6eaa84..c82cd251519e 100644 --- a/.github/workflows/reusable-serviceless-phpunit-test.yml +++ b/.github/workflows/reusable-serviceless-phpunit-test.yml @@ -124,6 +124,7 @@ jobs: env: TACHYCARDIA_MONITOR_GA: ${{ inputs.enable-profiling && 'enabled' || '' }} TERM: xterm-256color + continue-on-error: ${{ inputs.php-version == '8.6' }} - name: Upload coverage results as artifact if: ${{ inputs.enable-artifact-upload }} diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml index 274cc5311e2a..842f2664e76e 100644 --- a/.github/workflows/test-coding-standards.yml +++ b/.github/workflows/test-coding-standards.yml @@ -30,7 +30,7 @@ jobs: php-version: - '8.2' include: - - php-version: '8.5' + - php-version: '8.6' composer-option: '--ignore-platform-req=php' steps: diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index 8c17cae53de6..bd8dcbc6da95 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -60,6 +60,9 @@ jobs: - '8.3' - '8.4' - '8.5' + include: + - php-version: '8.6' + composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -86,6 +89,7 @@ jobs: - '8.3' - '8.4' - '8.5' + - '8.6' db-platform: - MySQLi - OCI8 @@ -98,6 +102,8 @@ jobs: - php-version: '8.2' db-platform: MySQLi mysql-version: '5.7' + - php-version: '8.6' + composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -125,6 +131,9 @@ jobs: - '8.3' - '8.4' - '8.5' + include: + - php-version: '8.5' + composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -150,6 +159,9 @@ jobs: - '8.3' - '8.4' - '8.5' + include: + - php-version: '8.5' + composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: diff --git a/composer.json b/composer.json index 26e76bd3f853..932c0c7611d1 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,8 @@ "CodeIgniter\\ComposerScripts::postUpdate" ], "post-autoload-dump": [ - "@composer update --ansi --working-dir=utils" + "@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" ], "analyze": [ "Composer\\Config::disableProcessTimeout",