Skip to content

Commit cd5dda1

Browse files
authored
feat: full support on PHP8.4 (#9255)
* 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
1 parent 1b530cd commit cd5dda1

File tree

6 files changed

+14
-20
lines changed

6 files changed

+14
-20
lines changed

.github/workflows/reusable-phpunit-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ jobs:
203203
DB: ${{ inputs.db-platform }}
204204
TACHYCARDIA_MONITOR_GA: ${{ inputs.enable-profiling && 'enabled' || '' }}
205205
TERM: xterm-256color
206-
continue-on-error: ${{ inputs.php-version == '8.4' }}
207206

208207
- name: Upload coverage results as artifact
209208
if: ${{ inputs.enable-artifact-upload }}

.github/workflows/test-coding-standards.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
php-version:
3131
- '8.1'
32-
- '8.3'
32+
- '8.4'
3333

3434
steps:
3535
- name: Checkout
@@ -59,3 +59,5 @@ jobs:
5959

6060
- name: Run lint
6161
run: composer cs
62+
env:
63+
PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-version == '8.4' }}

.github/workflows/test-phpunit.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ jobs:
5959
- '8.1'
6060
- '8.2'
6161
- '8.3'
62-
include:
63-
- php-version: '8.4'
64-
composer-option: '--ignore-platform-req=php'
62+
- '8.4'
6563

6664
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
6765
with:
@@ -88,6 +86,7 @@ jobs:
8886
- '8.1'
8987
- '8.2'
9088
- '8.3'
89+
- '8.4'
9190
db-platform:
9291
- MySQLi
9392
- OCI8
@@ -100,8 +99,6 @@ jobs:
10099
- php-version: '8.1'
101100
db-platform: MySQLi
102101
mysql-version: '5.7'
103-
- php-version: '8.4'
104-
composer-option: '--ignore-platform-req=php'
105102

106103
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
107104
with:
@@ -129,9 +126,7 @@ jobs:
129126
- '8.1'
130127
- '8.2'
131128
- '8.3'
132-
include:
133-
- php-version: '8.4'
134-
composer-option: '--ignore-platform-req=php'
129+
- '8.4'
135130

136131
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
137132
with:
@@ -157,9 +152,7 @@ jobs:
157152
- '8.1'
158153
- '8.2'
159154
- '8.3'
160-
include:
161-
- php-version: '8.4'
162-
composer-option: '--ignore-platform-req=php'
155+
- '8.4'
163156

164157
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
165158
with:

.github/workflows/test-rector.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
strategy:
4646
fail-fast: false
4747
matrix:
48-
php-versions: ['8.1', '8.3']
48+
php-versions: ['8.1', '8.4']
4949
steps:
5050
- name: Checkout
5151
uses: actions/checkout@v4

admin/framework/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
},
1919
"require-dev": {
2020
"codeigniter/coding-standard": "^1.7",
21-
"fakerphp/faker": "^1.9",
21+
"fakerphp/faker": "^1.24",
2222
"friendsofphp/php-cs-fixer": "^3.47.1",
2323
"kint-php/kint": "^6.0",
24-
"mikey179/vfsstream": "^1.6",
24+
"mikey179/vfsstream": "^1.6.12",
2525
"nexusphp/cs-config": "^3.6",
2626
"phpunit/phpunit": "^10.5.16 || ^11.2",
27-
"predis/predis": "^1.1 || ^2.0"
27+
"predis/predis": "^1.1 || ^2.3"
2828
},
2929
"suggest": {
3030
"ext-curl": "If you use CURLRequest class",

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
},
1919
"require-dev": {
2020
"codeigniter/phpstan-codeigniter": "^1.4",
21-
"fakerphp/faker": "^1.9",
21+
"fakerphp/faker": "^1.24",
2222
"kint-php/kint": "^6.0",
23-
"mikey179/vfsstream": "^1.6",
23+
"mikey179/vfsstream": "^1.6.12",
2424
"nexusphp/tachycardia": "^2.0",
2525
"phpstan/extension-installer": "^1.4",
2626
"phpstan/phpstan": "^1.11",
2727
"phpstan/phpstan-strict-rules": "^1.6",
2828
"phpunit/phpcov": "^9.0.2 || ^10.0",
2929
"phpunit/phpunit": "^10.5.16 || ^11.2",
30-
"predis/predis": "^1.1 || ^2.0",
30+
"predis/predis": "^1.1 || ^2.3",
3131
"rector/rector": "1.2.10"
3232
},
3333
"replace": {

0 commit comments

Comments
 (0)