Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/reusable-phpunit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/reusable-serviceless-phpunit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/test-phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ jobs:
- '8.3'
- '8.4'
- '8.5'
include:
- php-version: '8.6'
composer-option: '--ignore-platform-req=php'
Comment thread
paulbalandan marked this conversation as resolved.
Resolved

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand All @@ -84,6 +87,7 @@ jobs:
- '8.3'
- '8.4'
- '8.5'
- '8.6'
db-platform:
- MySQLi
- OCI8
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment on lines +96 to +97

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems this trick will no longer work as latest symfony/console uses the unparenthesized new expression available only in PHP 8.4+, and this ignore will happily install the latest version.

To workaround this, add a new public static method in ComposerScripts and add this:

if (PHP_VERSION_ID >= 80600) {
    passthru('composer update --ansi --working-dir=utils --ignore-platform-req=php');
} else {
    passthru('composer update --ansi --working-dir=utils');
}

and replace these lines with the name of the method: CodeIgniter\ComposerScripts::<new method>

],
"analyze": [
"Composer\\Config::disableProcessTimeout",
Expand Down
6 changes: 3 additions & 3 deletions utils/composer.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Loading