Skip to content

Commit 81c835d

Browse files
kenjiskenjis
authored
Merge pull request #8464 from codeigniter4/develop
4.4.5 Ready code
2 parents eb252d2 + 1e6c17a commit 81c835d

File tree

182 files changed

+2496
-1035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+2496
-1035
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ body:
2929
- '8.0'
3030
- '8.1'
3131
- '8.2'
32+
- '8.3'
3233
validations:
3334
required: true
3435

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
33
Each pull request should address a single issue and have a meaningful title.
44
5+
- PR title must include the type (feat, fix, chore, docs, perf, refactor, style, test) of the commit per Conventional Commits specification. See https://www.conventionalcommits.org/en/v1.0.0/ for the discussion.
56
- Pull requests must be in English.
67
- If a pull request fixes an issue, reference the issue with a suitable keyword (e.g., Fixes <issue number>).
78
- All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
8-
- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.3"__
9+
- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.5"__
910
1011
-->
1112
**Description**

‎.github/prlint.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"title": [
3+
{
4+
"pattern": "^(\\[\\d+\\.\\d+\\]\\s{1})?(feat|fix|chore|docs|perf|refactor|style|test)(\\([\\-.@:`a-zA-Z0-9]+\\))?!?:\\s{1}\\S.+\\S|Prep for \\d\\.\\d\\.\\d release|\\d\\.\\d\\.\\d Ready code$",
5+
"message": "PR title must include the type (feat, fix, chore, docs, perf, refactor, style, test) of the commit per Conventional Commits specification. See https://www.conventionalcommits.org/en/v1.0.0/ for the discussion."
6+
}
7+
]
8+
}

‎.github/workflows/deploy-userguide-latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
4949
# Create an artifact of the html output
5050
- name: Upload artifact
51-
uses: actions/upload-artifact@v3
51+
uses: actions/upload-artifact@v4
5252
with:
5353
name: HTML Documentation
5454
path: user_guide_src/build/html/

‎.github/workflows/reusable-coveralls.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
coverage: xdebug
2525

2626
- name: Download coverage files
27-
uses: actions/download-artifact@v3
27+
uses: actions/download-artifact@v4
2828
with:
2929
path: build/cov
3030

@@ -37,7 +37,7 @@ jobs:
3737
echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
3838
3939
- name: Cache dependencies
40-
uses: actions/cache@v3
40+
uses: actions/cache@v4
4141
with:
4242
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
4343
key: ${{ github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -46,7 +46,7 @@ jobs:
4646
${{ github.job }}-
4747
4848
- name: Cache PHPUnit's static analysis cache
49-
uses: actions/cache@v3
49+
uses: actions/cache@v4
5050
with:
5151
path: build/.phpunit.cache/code-coverage
5252
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}" >> $GITHUB_ENV
168168
169169
- name: Cache dependencies
170-
uses: actions/cache@v3
170+
uses: actions/cache@v4
171171
with:
172172
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
173173
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-${{ hashFiles('**/composer.*') }}
@@ -178,7 +178,7 @@ jobs:
178178
179179
- name: Cache PHPUnit's static analysis cache
180180
if: ${{ inputs.enable-artifact-upload }}
181-
uses: actions/cache@v3
181+
uses: actions/cache@v4
182182
with:
183183
path: build/.phpunit.cache/code-coverage
184184
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
@@ -206,7 +206,7 @@ jobs:
206206

207207
- name: Upload coverage results as artifact
208208
if: ${{ inputs.enable-artifact-upload }}
209-
uses: actions/upload-artifact@v3
209+
uses: actions/upload-artifact@v4
210210
with:
211211
name: ${{ env.ARTIFACT_NAME }}
212212
path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}" >> $GITHUB_ENV
8080
8181
- name: Cache Composer dependencies
82-
uses: actions/cache@v3
82+
uses: actions/cache@v4
8383
with:
8484
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
8585
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -89,7 +89,7 @@ jobs:
8989
9090
- name: Cache PHPUnit's static analysis cache
9191
if: ${{ inputs.enable-artifact-upload }}
92-
uses: actions/cache@v3
92+
uses: actions/cache@v4
9393
with:
9494
path: build/.phpunit.cache/code-coverage
9595
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
@@ -116,7 +116,7 @@ jobs:
116116

117117
- name: Upload coverage results as artifact
118118
if: ${{ inputs.enable-artifact-upload }}
119-
uses: actions/upload-artifact@v3
119+
uses: actions/upload-artifact@v4
120120
with:
121121
name: ${{ env.ARTIFACT_NAME }}
122122
path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4747

4848
- name: Cache dependencies
49-
uses: actions/cache@v3
49+
uses: actions/cache@v4
5050
with:
5151
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
5252
key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}

‎.github/workflows/test-deptrac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
5454

5555
- name: Cache dependencies
56-
uses: actions/cache@v3
56+
uses: actions/cache@v4
5757
with:
5858
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
5959
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -63,7 +63,7 @@ jobs:
6363
run: mkdir -p build/
6464

6565
- name: Cache Deptrac results
66-
uses: actions/cache@v3
66+
uses: actions/cache@v4
6767
with:
6868
path: build
6969
key: ${{ runner.os }}-deptrac-${{ github.sha }}

‎.github/workflows/test-phpstan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
6464

6565
- name: Cache dependencies
66-
uses: actions/cache@v3
66+
uses: actions/cache@v4
6767
with:
6868
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
6969
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -73,7 +73,7 @@ jobs:
7373
run: mkdir -p build/phpstan
7474

7575
- name: Cache PHPStan result cache directory
76-
uses: actions/cache@v3
76+
uses: actions/cache@v4
7777
with:
7878
path: build/phpstan
7979
key: ${{ runner.os }}-phpstan-${{ github.sha }}

‎.github/workflows/test-psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4545

4646
- name: Cache composer dependencies
47-
uses: actions/cache@v3
47+
uses: actions/cache@v4
4848
with:
4949
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
5050
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
@@ -54,7 +54,7 @@ jobs:
5454
run: mkdir -p build/psalm
5555

5656
- name: Cache Psalm results
57-
uses: actions/cache@v3
57+
uses: actions/cache@v4
5858
with:
5959
path: build/psalm
6060
key: ${{ runner.os }}-psalm-${{ github.sha }}

‎.github/workflows/test-rector.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
7272

7373
- name: Cache dependencies
74-
uses: actions/cache@v3
74+
uses: actions/cache@v4
7575
with:
7676
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
7777
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

‎.php-cs-fixer.dist.php

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,31 +43,7 @@
4343
__DIR__ . '/spark',
4444
]);
4545

46-
$overrides = [
47-
'php_unit_data_provider_name' => [
48-
'prefix' => 'provide',
49-
'suffix' => '',
50-
],
51-
'php_unit_data_provider_static' => true,
52-
'php_unit_data_provider_return_type' => true,
53-
'no_extra_blank_lines' => [
54-
'tokens' => [
55-
'attribute',
56-
'break',
57-
'case',
58-
'continue',
59-
'curly_brace_block',
60-
'default',
61-
'extra',
62-
'parenthesis_brace_block',
63-
'return',
64-
'square_brace_block',
65-
'switch',
66-
'throw',
67-
'use',
68-
],
69-
],
70-
];
46+
$overrides = [];
7147

7248
$options = [
7349
'cacheFile' => 'build/.php-cs-fixer.cache',

‎.php-cs-fixer.no-header.php

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,7 @@
2929
__DIR__ . '/admin/starter/builds',
3030
]);
3131

32-
$overrides = [
33-
'php_unit_data_provider_name' => [
34-
'prefix' => 'provide',
35-
'suffix' => '',
36-
],
37-
'php_unit_data_provider_static' => true,
38-
'php_unit_data_provider_return_type' => true,
39-
'no_extra_blank_lines' => [
40-
'tokens' => [
41-
'attribute',
42-
'break',
43-
'case',
44-
'continue',
45-
'curly_brace_block',
46-
'default',
47-
'extra',
48-
'parenthesis_brace_block',
49-
'return',
50-
'square_brace_block',
51-
'switch',
52-
'throw',
53-
'use',
54-
],
55-
],
56-
];
32+
$overrides = [];
5733

5834
$options = [
5935
'cacheFile' => 'build/.php-cs-fixer.no-header.cache',

‎.php-cs-fixer.user-guide.php

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,13 @@
3131
]);
3232

3333
$overrides = [
34-
'echo_tag_syntax' => false,
35-
'php_unit_internal_class' => false,
36-
'no_unused_imports' => false,
37-
'class_attributes_separation' => false,
38-
'php_unit_data_provider_return_type' => true,
39-
'no_extra_blank_lines' => [
40-
'tokens' => [
41-
'attribute',
42-
'break',
43-
'case',
44-
'continue',
45-
'curly_brace_block',
46-
'default',
47-
'extra',
48-
'parenthesis_brace_block',
49-
'return',
50-
'square_brace_block',
51-
'switch',
52-
'throw',
53-
'use',
54-
],
55-
],
56-
'php_unit_data_provider_static' => true,
57-
'php_unit_data_provider_name' => [
58-
'prefix' => 'provide',
59-
'suffix' => '',
34+
'echo_tag_syntax' => false,
35+
'php_unit_internal_class' => false,
36+
'no_unused_imports' => false,
37+
'class_attributes_separation' => false,
38+
'fully_qualified_strict_types' => [
39+
'import_symbols' => false,
40+
'leading_backslash_in_global_namespace' => true,
6041
],
6142
];
6243

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# Changelog
22

3+
## [v4.4.5](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.5) (2024-01-27)
4+
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.4...v4.4.5)
5+
6+
### Fixed Bugs
7+
8+
* fix: bug 4.4.4 `spark serve` not working when using Session in Routes.php by @ALTITUDE-DEV-FR in https://github.com/codeigniter4/CodeIgniter4/pull/8389
9+
* fix: `highlightFile()` in `BaseExceptionHandler` for PHP 8.3 by @michalsn in https://github.com/codeigniter4/CodeIgniter4/pull/8401
10+
* fix: [Validation] DotArrayFilter returns incorrect array when numeric index array is passed by @grimpirate in https://github.com/codeigniter4/CodeIgniter4/pull/8425
11+
* fix: OCI8 Forge always sets NOT NULL when BOOLEAN is specified by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8440
12+
* fix: DB Seeder may use wrong DB connection during testing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8447
13+
* fix: [Postgre] QueryBuilder::updateBatch() does not work (No API change) by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8439
14+
* fix: [Postgre] QueryBuilder::deleteBatch() does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8451
15+
* fix: [Email] setAttachmentCID() does not work with buffer string by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8446
16+
* fix: add undocumented Model $allowEmptyInserts by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8456
17+
18+
### Refactoring
19+
20+
* refactor: remove overrides for coding-standard v1.7.12 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/8386
21+
* refactor: Table class to fix phpstan errors by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8402
22+
* fix: typo in pager default_simple by @jasonliang-dev in https://github.com/codeigniter4/CodeIgniter4/pull/8407
23+
* refactor: improve Forge variable names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8434
24+
325
## [v4.4.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.4) (2023-12-28)
426
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.3...v4.4.4)
527

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CodeIgniter 4 Development
22

3-
[![PHPUnit](https://github.com/codeigniter4/CodeIgniter4/workflows/PHPUnit/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpunit.yml)
3+
[![PHPUnit](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpunit.yml/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpunit.yml)
44
[![PHPStan](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpstan.yml/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpstan.yml)
55
[![Psalm](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-psalm.yml/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-psalm.yml)
66
[![Coverage Status](https://coveralls.io/repos/github/codeigniter4/CodeIgniter4/badge.svg?branch=develop)](https://coveralls.io/github/codeigniter4/CodeIgniter4?branch=develop)

‎admin/RELEASE.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,21 @@
66
>
77
> -MGatner, kenjis
88
9-
## [Minor version only] Merge minor version branch into develop
9+
## Merge `develop` branch into next minor version branch `4.x`
10+
11+
Before starting release process, if there are commits in `develop` branch that
12+
are not merged into `4.x` branch, merge them. This is because if conflicts occur,
13+
merging will take time.
14+
15+
```console
16+
git fetch upstream
17+
git switch 4.x
18+
git merge upstream/4.x
19+
git merge upstream/develop
20+
git push upstream HEAD
21+
```
22+
23+
## [Minor version only] Merge minor version branch into `develop`
1024

1125
If you release a new minor version.
1226

@@ -149,15 +163,15 @@ Work off direct clones of the repos so the release branches persist for a time.
149163
git merge origin/master
150164
git push origin HEAD
151165
```
152-
* [ ] Update the next minor upgrade branch `4.x`:
166+
* [ ] Update the next minor version branch `4.x`:
153167
```console
154168
git fetch origin
155169
git checkout 4.x
156170
git merge origin/4.x
157171
git merge origin/develop
158172
git push origin HEAD
159173
```
160-
* [ ] [Minor version only] Create the next minor upgrade branch `4.x`:
174+
* [ ] [Minor version only] Create the new next minor version branch `4.x`:
161175
```console
162176
git fetch origin
163177
git switch develop

‎admin/framework/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"psr/log": "^1.1"
1919
},
2020
"require-dev": {
21-
"codeigniter/coding-standard": "^1.5",
21+
"codeigniter/coding-standard": "^1.7",
2222
"fakerphp/faker": "^1.9",
23-
"friendsofphp/php-cs-fixer": "~3.41.0",
23+
"friendsofphp/php-cs-fixer": "^3.47.1",
2424
"kint-php/kint": "^5.0.4",
2525
"mikey179/vfsstream": "^1.6",
2626
"nexusphp/cs-config": "^3.6",

0 commit comments

Comments
 (0)