Skip to content

Commit

Permalink
feat: full support on PHP8.4 (#9255)
Browse files Browse the repository at this point in the history
* refactor: review github CI on PHP8.4

* refactor: bump fakerphp/faker to v1.24 as minimum required

* refactor: bump mikey179/vfsstream to v1.6.12 as minimum required

* refactor: bump predis/predis to v2.3 as minimum required

* temporary ignore env PHP-CS-Fixer in github action
  • Loading branch information
ddevsr authored Dec 17, 2024
1 parent 1b530cd commit cd5dda1
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 20 deletions.
1 change: 0 additions & 1 deletion .github/workflows/reusable-phpunit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ jobs:
DB: ${{ inputs.db-platform }}
TACHYCARDIA_MONITOR_GA: ${{ inputs.enable-profiling && 'enabled' || '' }}
TERM: xterm-256color
continue-on-error: ${{ inputs.php-version == '8.4' }}

- name: Upload coverage results as artifact
if: ${{ inputs.enable-artifact-upload }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
matrix:
php-version:
- '8.1'
- '8.3'
- '8.4'

steps:
- name: Checkout
Expand Down Expand Up @@ -59,3 +59,5 @@ jobs:

- name: Run lint
run: composer cs
env:
PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-version == '8.4' }}
15 changes: 4 additions & 11 deletions .github/workflows/test-phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ jobs:
- '8.1'
- '8.2'
- '8.3'
include:
- php-version: '8.4'
composer-option: '--ignore-platform-req=php'
- '8.4'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand All @@ -88,6 +86,7 @@ jobs:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
db-platform:
- MySQLi
- OCI8
Expand All @@ -100,8 +99,6 @@ jobs:
- php-version: '8.1'
db-platform: MySQLi
mysql-version: '5.7'
- php-version: '8.4'
composer-option: '--ignore-platform-req=php'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand Down Expand Up @@ -129,9 +126,7 @@ jobs:
- '8.1'
- '8.2'
- '8.3'
include:
- php-version: '8.4'
composer-option: '--ignore-platform-req=php'
- '8.4'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand All @@ -157,9 +152,7 @@ jobs:
- '8.1'
- '8.2'
- '8.3'
include:
- php-version: '8.4'
composer-option: '--ignore-platform-req=php'
- '8.4'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-rector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['8.1', '8.3']
php-versions: ['8.1', '8.4']
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions admin/framework/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
},
"require-dev": {
"codeigniter/coding-standard": "^1.7",
"fakerphp/faker": "^1.9",
"fakerphp/faker": "^1.24",
"friendsofphp/php-cs-fixer": "^3.47.1",
"kint-php/kint": "^6.0",
"mikey179/vfsstream": "^1.6",
"mikey179/vfsstream": "^1.6.12",
"nexusphp/cs-config": "^3.6",
"phpunit/phpunit": "^10.5.16 || ^11.2",
"predis/predis": "^1.1 || ^2.0"
"predis/predis": "^1.1 || ^2.3"
},
"suggest": {
"ext-curl": "If you use CURLRequest class",
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
},
"require-dev": {
"codeigniter/phpstan-codeigniter": "^1.4",
"fakerphp/faker": "^1.9",
"fakerphp/faker": "^1.24",
"kint-php/kint": "^6.0",
"mikey179/vfsstream": "^1.6",
"mikey179/vfsstream": "^1.6.12",
"nexusphp/tachycardia": "^2.0",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan": "^1.11",
"phpstan/phpstan-strict-rules": "^1.6",
"phpunit/phpcov": "^9.0.2 || ^10.0",
"phpunit/phpunit": "^10.5.16 || ^11.2",
"predis/predis": "^1.1 || ^2.0",
"predis/predis": "^1.1 || ^2.3",
"rector/rector": "1.2.10"
},
"replace": {
Expand Down

0 comments on commit cd5dda1

Please sign in to comment.