Skip to content

Commit 00b4aff

Browse files
pjsdepjsde
authored
Merge branch 'codeigniter4:develop' into fix-routing
2 parents e3e7a0e + e420c03 commit 00b4aff

26 files changed

+744
-100
lines changed

‎.github/workflows/label-conflict.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Auto Label Conflicts
2+
on:
3+
pull_request:
4+
branches:
5+
- 'develop'
6+
- '4.*'
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
10+
cancel-in-progress: true
11+
12+
permissions:
13+
contents: read
14+
issues: write
15+
pull-requests: write
16+
17+
jobs:
18+
auto-label:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: prince-chrismc/label-merge-conflicts-action@v3
22+
with:
23+
conflict_label_name: 'stale'
24+
github_token: ${{ github.token }}
25+
26+
# --- Optional Inputs ---
27+
# To make sure the merge commit exactly matches the branch
28+
detect_merge_changes: true # or true to handle as conflicts
29+
# By default a comment will be left, adding `conflict_comment: ''` will disable comments
30+
# The optional `${author}` will be replaced with the username of the pull request
31+
conflict_comment: |
32+
:wave: Hi, @${author},
33+
34+
We detected conflicts in your PR against the base branch :speak_no_evil:
35+
You may want to sync :arrows_counterclockwise: your branch with upstream!
36+
37+
Ref: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch

‎.github/workflows/label-signing.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Check Signed PR
2+
on:
3+
pull_request:
4+
branches:
5+
- 'develop'
6+
- '4.*'
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
10+
cancel-in-progress: true
11+
12+
permissions:
13+
contents: read
14+
pull-requests: write
15+
16+
jobs:
17+
build:
18+
name: Check Signed Commit
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v4
23+
24+
- name: Check signed commits in PR
25+
uses: 1Password/check-signed-commits-action@v1
26+
with:
27+
comment: |
28+
You must GPG-sign your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open-source project. See Developer's Certificate of Origin. See [signing][1].
29+
30+
**Note that all your commits must be signed.** If you have an unsigned commit, you can sign the previous commits by referring to [gpg-signing-old-commits][2].
31+
[1]: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#signing
32+
[2]: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits

‎.github/workflows/test-phpunit.yml

+19
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ jobs:
5959
- '8.0'
6060
- '8.1'
6161
- '8.2'
62+
- '8.3'
63+
include:
64+
- php-version: '8.3'
65+
composer-option: '--ignore-platform-req=php'
6266

6367
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
6468
with:
@@ -70,6 +74,7 @@ jobs:
7074
enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
7175
enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
7276
extra-extensions: imagick, redis, memcached
77+
extra-composer-options: ${{ matrix.composer-option }}
7378

7479
database-live-tests:
7580
needs:
@@ -84,6 +89,7 @@ jobs:
8489
- '8.0'
8590
- '8.1'
8691
- '8.2'
92+
- '8.3'
8793
db-platform:
8894
- MySQLi
8995
- OCI8
@@ -96,6 +102,8 @@ jobs:
96102
- php-version: '7.4'
97103
db-platform: MySQLi
98104
mysql-version: '8.0'
105+
- php-version: '8.3'
106+
composer-option: '--ignore-platform-req=php'
99107

100108
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
101109
with:
@@ -109,6 +117,7 @@ jobs:
109117
enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
110118
enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
111119
extra-extensions: mysqli, oci8, pgsql, sqlsrv-5.10.1, sqlite3
120+
extra-composer-options: ${{ matrix.composer-option }}
112121

113122
separate-process-tests:
114123
needs:
@@ -122,6 +131,10 @@ jobs:
122131
- '8.0'
123132
- '8.1'
124133
- '8.2'
134+
- '8.3'
135+
include:
136+
- php-version: '8.3'
137+
composer-option: '--ignore-platform-req=php'
125138

126139
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
127140
with:
@@ -133,6 +146,7 @@ jobs:
133146
enable-coverage: true # needs xdebug for assertHeaderEmitted() tests
134147
enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
135148
extra-extensions: mysqli, oci8, pgsql, sqlsrv-5.10.1, sqlite3
149+
extra-composer-options: ${{ matrix.composer-option }}
136150

137151
cache-live-tests:
138152
needs:
@@ -146,6 +160,10 @@ jobs:
146160
- '8.0'
147161
- '8.1'
148162
- '8.2'
163+
- '8.3'
164+
include:
165+
- php-version: '8.3'
166+
composer-option: '--ignore-platform-req=php'
149167

150168
uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
151169
with:
@@ -157,6 +175,7 @@ jobs:
157175
enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
158176
enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
159177
extra-extensions: redis, memcached
178+
extra-composer-options: ${{ matrix.composer-option }}
160179

161180
coveralls:
162181
name: Upload coverage results to Coveralls

‎README.md

+5
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ PHP version 7.4 or higher is required, with the following extensions installed:
9191
- [intl](http://php.net/manual/en/intl.requirements.php)
9292
- [mbstring](http://php.net/manual/en/mbstring.installation.php)
9393

94+
> **Warning**
95+
> The end of life date for PHP 7.4 was November 28, 2022. If you are
96+
> still using PHP 7.4, you should upgrade immediately. The end of life date
97+
> for PHP 8.0 will be November 26, 2023.
98+
9499
Additionally, make sure that the following extensions are enabled in your PHP:
95100

96101
- json (enabled by default - don't turn it off)

‎admin/css/debug-toolbar/_theme-dark.scss

+4
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@
150150
.timer {
151151
background-color: $g-orange;
152152
}
153+
154+
.timeline-parent-open td {
155+
color: $t-dark;
156+
}
153157
}
154158
}
155159

‎admin/framework/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ writable/uploads/*
6161
!writable/uploads/index.html
6262

6363
writable/debugbar/*
64+
!writable/debugbar/.gitkeep
6465

6566
php_errors.log
6667

‎admin/framework/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ PHP version 7.4 or higher is required, with the following extensions installed:
4747
- [intl](http://php.net/manual/en/intl.requirements.php)
4848
- [mbstring](http://php.net/manual/en/mbstring.installation.php)
4949

50+
> **Warning**
51+
> The end of life date for PHP 7.4 was November 28, 2022. If you are
52+
> still using PHP 7.4, you should upgrade immediately. The end of life date
53+
> for PHP 8.0 will be November 26, 2023.
54+
5055
Additionally, make sure that the following extensions are enabled in your PHP:
5156

5257
- json (enabled by default - don't turn it off)

‎admin/starter/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ writable/uploads/*
6161
!writable/uploads/index.html
6262

6363
writable/debugbar/*
64+
!writable/debugbar/.gitkeep
6465

6566
php_errors.log
6667

‎admin/starter/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ PHP version 7.4 or higher is required, with the following extensions installed:
5555
- [intl](http://php.net/manual/en/intl.requirements.php)
5656
- [mbstring](http://php.net/manual/en/mbstring.installation.php)
5757

58+
> **Warning**
59+
> The end of life date for PHP 7.4 was November 28, 2022. If you are
60+
> still using PHP 7.4, you should upgrade immediately. The end of life date
61+
> for PHP 8.0 will be November 26, 2023.
62+
5863
Additionally, make sure that the following extensions are enabled in your PHP:
5964

6065
- json (enabled by default - don't turn it off)

‎composer.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@
1919
},
2020
"require-dev": {
2121
"codeigniter/coding-standard": "^1.5",
22+
"codeigniter/phpstan-codeigniter": "^v1.1",
2223
"ergebnis/composer-normalize": "^2.28",
2324
"fakerphp/faker": "^1.9",
2425
"kint-php/kint": "^5.0.4",
2526
"mikey179/vfsstream": "^1.6",
2627
"nexusphp/cs-config": "^3.6",
2728
"nexusphp/tachycardia": "^1.0",
2829
"php-coveralls/php-coveralls": "^2.5",
30+
"phpstan/extension-installer": "^1.3",
2931
"phpstan/phpstan": "^1.10.2",
3032
"phpstan/phpstan-strict-rules": "^1.5",
3133
"phpunit/phpcov": "^8.2",
3234
"phpunit/phpunit": "^9.1",
3335
"predis/predis": "^1.1 || ^2.0",
34-
"rector/rector": "0.18.2",
36+
"rector/rector": "0.18.3",
3537
"vimeo/psalm": "^5.0"
3638
},
3739
"suggest": {
@@ -70,7 +72,8 @@
7072
},
7173
"config": {
7274
"allow-plugins": {
73-
"ergebnis/composer-normalize": true
75+
"ergebnis/composer-normalize": true,
76+
"phpstan/extension-installer": true
7477
},
7578
"optimize-autoloader": true,
7679
"preferred-install": "dist",

0 commit comments

Comments
 (0)