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 4a00c0a576c0..fe59b474ee31 100644 --- a/.github/workflows/test-coding-standards.yml +++ b/.github/workflows/test-coding-standards.yml @@ -32,7 +32,7 @@ jobs: php-version: - '8.3' 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 d5613a499443..44234e901a66 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -59,6 +59,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: @@ -84,6 +87,7 @@ jobs: - '8.3' - '8.4' - '8.5' + - '8.6' db-platform: - MySQLi - OCI8 @@ -96,6 +100,8 @@ jobs: - php-version: '8.3' 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: @@ -122,6 +128,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: @@ -146,6 +155,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 f986873e0c12..2e0ae35a692d 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 >= 80600) { 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", diff --git a/utils/composer.json b/utils/composer.json index 33155ce245a8..34c8e6da821f 100644 --- a/utils/composer.json +++ b/utils/composer.json @@ -1,11 +1,11 @@ { "require": { "php": "^8.3", - "codeigniter/coding-standard": "^1.7", - "ergebnis/composer-normalize": "^2.28", + "codeigniter/coding-standard": "^1.9", + "ergebnis/composer-normalize": "^2.56", "friendsofphp/php-cs-fixer": "^3.76", "nexusphp/cs-config": "^3.26", - "vimeo/psalm": "^6.14" + "vimeo/psalm": "^7.0.1" }, "autoload": { "psr-4": {