Skip to content

Commit d51d4e9

Browse files
authored
Merge pull request #6445 from codeigniter4/develop
4.2.5 Ready code
2 parents 459e00e + 800c2c1 commit d51d4e9

File tree

115 files changed

+1477
-1453
lines changed

Some content is hidden

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

115 files changed

+1477
-1453
lines changed

.github/workflows/test-rector.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- 'utils/**.php'
1515
- '.github/workflows/test-rector.yml'
1616
- composer.json
17+
- rector.php
1718

1819
push:
1920
branches:
@@ -26,6 +27,7 @@ on:
2627
- 'utils/**.php'
2728
- '.github/workflows/test-rector.yml'
2829
- composer.json
30+
- rector.php
2931

3032
jobs:
3133
build:

.github/workflows/test-userguide.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ jobs:
2525
- uses: ammaraskar/[email protected]
2626
with:
2727
docs-folder: user_guide_src
28+
build-command: 'make html SPHINXOPTS="-W --keep-going -w /tmp/sphinx-log"'

.php-cs-fixer.dist.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
__DIR__ . '/tests',
2626
__DIR__ . '/utils',
2727
])
28-
->exclude(['ThirdParty'])
28+
->exclude([
29+
'Pager/Views',
30+
'ThirdParty',
31+
'Validation/Views',
32+
])
2933
->notName('#Foobar.php$#')
3034
->append([
3135
__FILE__,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
__DIR__ . '/app',
2626
__DIR__ . '/public',
2727
])
28+
->exclude(['Views/errors/html'])
2829
->notName('#Logger\.php$#')
2930
->append([
3031
__DIR__ . '/admin/starter/builds',

CHANGELOG.md

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

3+
## [v4.2.5](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.5) (2022-08-28)
4+
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.4...v4.2.5)
5+
6+
### Breaking Changes
7+
* Add $cached param to BaseConnection::tableExists() by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/6364
8+
* Fix validation custom error asterisk field by @ping-yee in https://github.com/codeigniter4/CodeIgniter4/pull/6378
9+
10+
### Fixed Bugs
11+
* fix: Email class may not log an error when it fails to send by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6362
12+
* fix: Response::download() causes TypeError by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6361
13+
* fix: command usages by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6402
14+
* Fix: The subquery adds a prefix for the table alias. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/6390
15+
* Fix Sqlite Table::createTable() by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/6396
16+
* docs: add missing `@method` `groupBy()` in Model by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6433
17+
* fix: CLIRequest Erros in CLI by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6421
18+
* fix: Call to undefined method CodeIgniter\HTTP\CLIRequest::getLocale() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6442
19+
20+
### Enhancements
21+
* chore: update Kint to 4.2.0 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6436
22+
23+
### Refactoring
24+
* refactor: add test for DownloadResponse by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6375
25+
* refactor: ValidationTest by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6382
26+
* refactor: remove unused `_parent_name` in BaseBuilder::objectToArray() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6427
27+
* Remove unneeded abstract `handle()` method by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/6434
28+
329
## [v4.2.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.4) (2022-08-13)
430
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.3...v4.2.4)
531

admin/framework/composer.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"ext-intl": "*",
1111
"ext-json": "*",
1212
"ext-mbstring": "*",
13-
"kint-php/kint": "^4.1.1",
13+
"kint-php/kint": "^4.2",
1414
"laminas/laminas-escaper": "^2.9",
1515
"psr/log": "^1.1"
1616
},
@@ -24,7 +24,18 @@
2424
"predis/predis": "^1.1 || ^2.0"
2525
},
2626
"suggest": {
27-
"ext-fileinfo": "Improves mime type detection for files"
27+
"ext-imagick": "If you use Image class ImageMagickHandler",
28+
"ext-simplexml": "If you format XML",
29+
"ext-mysqli": "If you use MySQL",
30+
"ext-oci8": "If you use Oracle Database",
31+
"ext-pgsql": "If you use PostgreSQL",
32+
"ext-sqlsrv": "If you use SQL Server",
33+
"ext-sqlite3": "If you use SQLite3",
34+
"ext-memcache": "If you use Cache class MemcachedHandler with Memcache",
35+
"ext-memcached": "If you use Cache class MemcachedHandler with Memcached",
36+
"ext-redis": "If you use Cache class RedisHandler",
37+
"ext-fileinfo": "Improves mime type detection for files",
38+
"ext-readline": "Improves CLI::input() usability"
2839
},
2940
"autoload": {
3041
"psr-4": {

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"ext-intl": "*",
1111
"ext-json": "*",
1212
"ext-mbstring": "*",
13-
"kint-php/kint": "^4.1.1",
13+
"kint-php/kint": "^4.2",
1414
"laminas/laminas-escaper": "^2.9",
1515
"psr/log": "^1.1"
1616
},
@@ -24,7 +24,7 @@
2424
"phpstan/phpstan": "^1.7.1",
2525
"phpunit/phpunit": "^9.1",
2626
"predis/predis": "^1.1 || ^2.0",
27-
"rector/rector": "0.13.10"
27+
"rector/rector": "0.14.0"
2828
},
2929
"suggest": {
3030
"ext-imagick": "If you use Image class ImageMagickHandler",

contributing/documentation.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ To a URL
124124
To a Function
125125
=============
126126

127-
:php:func:`dot_array_search`
127+
:php:func:`dot_array_search()`
128128

129-
:php:func:`Response::setCookie() <setCookie>`
129+
To a Method
130+
=============
131+
132+
:php:meth:`CodeIgniter\\HTTP\\Response::setCookie()`

contributing/pull_request.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,18 +249,17 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
249249
7. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.
250250
8. [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project) the changed files in your contribution branch.
251251
- `> git commit`
252-
- Commit messages are expected to be descriptive of what you changed specifically. Commit messages like "Fixes #1234" would be asked by the reviewer to be revised.
253-
9. If there are intermediate commits that are not meaningful to the overall PR, such as "Fixed error on style guide", "Fixed phpstan error", "Fixing mistake in code", and other related commits, it is advised to squash your commits so that we can have a clean commit history.
254-
10. If you have touched PHP code, run static analysis.
252+
- Commit messages are expected to be descriptive of why and what you changed specifically. Commit messages like "Fixes #1234" would be asked by the reviewer to be revised. [Atomic commit](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention) is recommended. See [Contribution Workflow](./workflow.md#commit-messages) for details.
253+
9. If you have touched PHP code, run static analysis.
255254
- `> composer analyze`
256255
- `> vendor/bin/rector process`
257-
11. Run unit tests on the specific file you modified. If there are no existing tests yet, please create one.
256+
10. Run unit tests on the specific file you modified. If there are no existing tests yet, please create one.
258257
- `> vendor/bin/phpunit tests/system/path/to/file/you/modified`
259258
- Make sure the tests pass to have a higher chance of merging.
260-
12. [Push](https://docs.github.com/en/github/using-git/pushing-commits-to-a-remote-repository) your contribution branch to your fork.
259+
11. [Push](https://docs.github.com/en/github/using-git/pushing-commits-to-a-remote-repository) your contribution branch to your fork.
261260
- `> git push origin <new-branch-name>`
262-
13. Send a [pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
263-
14. Label your pull request with the appropriate label if you can.
261+
12. Send a [pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
262+
13. Label your pull request with the appropriate label if you can.
264263

265264
See [Contribution workflow](./workflow.md) for Git workflow details.
266265

contributing/signing.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,4 @@ bash shell to use the **-S** option to force the secure signing.
5252
## Commit Messages
5353

5454
Regardless of how you sign a commit, commit messages are important too.
55-
They communicate the intent of a specific change, concisely. They make
56-
it easier to review code, and to find out why a change was made if the
57-
code history is examined later.
58-
59-
The audience for your commit messages will be the codebase maintainers,
60-
any code reviewers, and debuggers trying to figure out when a bug might
61-
have been introduced.
62-
63-
Make your commit messages meaningful.
55+
See [Contribution Workflow](./workflow.md#commit-messages) for details.

0 commit comments

Comments
 (0)