Skip to content

Commit d3c5dcc

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.7
2 parents 112f4e9 + 7a3563d commit d3c5dcc

File tree

13 files changed

+685
-693
lines changed

13 files changed

+685
-693
lines changed

CHANGELOG.md

Lines changed: 15 additions & 653 deletions
Large diffs are not rendered by default.

admin/RELEASE.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ the existing content.
105105
* [ ] Update **user_guide_src/source/installation/upgrade_4xx.rst**
106106
* [ ] fill in the "All Changes" section using the following command, and add it to **upgrade_4xx.rst**:
107107
```
108-
git diff --name-status origin/master -- . ':!.github/' ':!admin/' ':!system/' ':!tests/' \
109-
':!user_guide_src/' ':!utils/' ':!*.json' ':!*.xml' ':!*.dist' ':!rector.php' \
108+
git diff --name-status upstream/master -- . ':!.github/' ':!admin/' ':!changelogs/' ':!contributing/' \
109+
':!system/' ':!tests/' ':!user_guide_src/' ':!utils/' \
110+
':!*.json' ':!*.xml' ':!*.dist' ':!rector.php' ':!deptrac.yml' \
110111
':!phpstan*' ':!psalm*' ':!.php-cs-fixer.*' ':!LICENSE' ':!CHANGELOG.md'
111112
```
112113
* Note: `tests/` is not used for distribution repos. See `admin/starter/tests/`.

changelogs/CHANGELOG_4.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,4 +562,4 @@ This release focuses on code style. All changes (except those noted below) are c
562562
- Backfill non-optional parameters (https://github.com/codeigniter4/CodeIgniter4/pull/3938)
563563
- Change deprecated assertFileNotExists (https://github.com/codeigniter4/CodeIgniter4/pull/3862)
564564

565-
See [CHANGELOG_4.0.md](./CHANGELOG_4.0.md)
565+
For the changelog of v4.0, see [CHANGELOG_4.0.md](./CHANGELOG_4.0.md).

changelogs/CHANGELOG_4.2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,4 +420,4 @@
420420
* Small change to improve code reading by @valmorflores in https://github.com/codeigniter4/CodeIgniter4/pull/6051
421421
* refactor: remove `CodeIgniter\Services` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6053
422422

423-
See [CHANGELOG_4.1.md](./CHANGELOG_4.1.md)
423+
For the changelog of v4.1, see [CHANGELOG_4.1.md](./CHANGELOG_4.1.md).

changelogs/CHANGELOG_4.3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,4 @@
323323
* refactor: remove Workaround for Faker deprecation errors in PHP 8.2 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6987
324324
* refactor: to fix psalm error by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6999
325325

326-
See [CHANGELOG_4.2.md](./CHANGELOG_4.2.md)
326+
For the changelog of v4.2, see [CHANGELOG_4.2.md](./CHANGELOG_4.2.md).

changelogs/CHANGELOG_4.4.md

Lines changed: 308 additions & 0 deletions
Large diffs are not rendered by default.

changelogs/CHANGELOG_4.5.md

Lines changed: 349 additions & 0 deletions
Large diffs are not rendered by default.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"psr/log": "^3.0"
1818
},
1919
"require-dev": {
20-
"codeigniter/phpstan-codeigniter": "1.x-dev",
20+
"codeigniter/phpstan-codeigniter": "^1.5",
2121
"fakerphp/faker": "^1.24",
2222
"kint-php/kint": "^6.1",
2323
"mikey179/vfsstream": "^1.6.12",

phpdoc.dist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<output>api/build/</output>
1111
<cache>api/cache/</cache>
1212
</paths>
13-
<version number="4.6.4">
13+
<version number="4.6.5">
1414
<api format="php">
1515
<source dsn=".">
1616
<path>system</path>

system/CodeIgniter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class CodeIgniter
5555
/**
5656
* The current version of CodeIgniter Framework
5757
*/
58-
public const CI_VERSION = '4.6.4';
58+
public const CI_VERSION = '4.6.5';
5959

6060
/**
6161
* App startup time.

0 commit comments

Comments
 (0)