Skip to content

Commit daf65f9

Browse files
authored
Merge pull request #9358 from codeigniter4/develop
4.5.7 Ready code
2 parents 51cdd7d + e8cd894 commit daf65f9

Some content is hidden

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

69 files changed

+315
-180
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ blank_issues_enabled: false
22
contact_links:
33
- name: CodeIgniter Forum
44
url: https://forum.codeigniter.com/forum-30.html
5-
about: Please ask your support questions in the forums. Thanks!
5+
about: Please ask your support questions and/or feature requests in the forums. Thanks!
66

77
- name: CodeIgniter Slack channel
88
url: https://codeigniterchat.slack.com

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
name: Planned work
3-
about: Approved work planning
3+
about: Maintainers' space. DO NOT use this for your bug reports!
44
title: 'Dev: '
55
labels: dev
66
assignees: ''
77

88
---
99

10-
Repo maintainers will create "issues" for planned work, so it can be tracked.
10+
Maintainers will create "issues" for planned work, so it can be tracked.

.github/mergeable.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# https://mergeable.readthedocs.io/en/latest/configuration.html
2+
3+
version: 2
4+
mergeable:
5+
- when: issues.opened
6+
validate:
7+
- do: description
8+
and:
9+
- must_include:
10+
regex: '^### PHP Version'
11+
- must_include:
12+
regex: '^### CodeIgniter4 Version'
13+
- do: author
14+
and:
15+
- must_exclude:
16+
regex: 'kenjis'
17+
- must_exclude:
18+
regex: 'lonnieezell'
19+
- must_exclude:
20+
regex: 'MGatner'
21+
- must_exclude:
22+
regex: 'michalsn'
23+
- must_exclude:
24+
regex: 'paulbalandan'
25+
- must_exclude:
26+
regex: 'samsonasik'
27+
fail:
28+
- do: comment
29+
payload: |
30+
Hi there! :wave:
31+
32+
It looks like you opened an issue without following the bug report template:
33+
34+
Bug report ([open an issue](https://github.com/codeigniter4/CodeIgniter4/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=Bug%3A+))
35+
36+
If you are opening a feature request or support question, please do so in the [forums](https://forum.codeigniter.com/forum-30.html).
37+
38+
The current issue will be closed. This is a precaution to save maintainers' time, I hope you'll understand.
39+
40+
Sincerely, the mergeable bot 🤖
41+
- do: close

CHANGELOG.md

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

3+
## [v4.5.7](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.7) (2024-12-31)
4+
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.6...v4.5.7)
5+
6+
### Fixed Bugs
7+
8+
* fix: handle namespaced helper found on Common helper by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/9354
9+
* fix: `Forge::dropColumn()` always returns `false` on SQLite3 driver by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/9351
10+
11+
### Refactoring
12+
13+
* refactor: enable AddArrowFunctionReturnTypeRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/9343
14+
315
## [v4.5.6](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.6) (2024-12-28)
416
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.5...v4.5.6)
517

app/Views/errors/cli/error_exception.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
$function .= $padClass . $error['function'];
5151
}
5252

53-
$args = implode(', ', array_map(static fn ($value) => match (true) {
53+
$args = implode(', ', array_map(static fn ($value): string => match (true) {
5454
is_object($value) => 'Object(' . $value::class . ')',
5555
is_array($value) => $value !== [] ? '[...]' : '[]',
5656
$value === null => 'null', // return the lowercased version

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.5.6">
13+
<version number="4.5.7">
1414
<api format="php">
1515
<source dsn=".">
1616
<path>system</path>

rector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
4242
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
4343
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
44+
use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
4445
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
4546
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
4647
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
@@ -201,6 +202,7 @@
201202
TypedPropertyFromAssignsRector::class,
202203
ClosureReturnTypeRector::class,
203204
FlipTypeControlToUseExclusiveTypeRector::class,
205+
AddArrowFunctionReturnTypeRector::class,
204206
])
205207
->withConfiguredRule(StringClassNameToClassConstantRector::class, [
206208
// keep '\\' prefix string on string '\Foo\Bar'

system/CLI/CLI.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
339339
$pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));
340340

341341
// separate input by comma and convert all to an int[]
342-
$inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
342+
$inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
343343
// find max from key of $options
344344
$maxOptions = array_key_last($options);
345345
// find max from input

system/CodeIgniter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CodeIgniter
5656
/**
5757
* The current version of CodeIgniter Framework
5858
*/
59-
public const CI_VERSION = '4.5.6';
59+
public const CI_VERSION = '4.5.7';
6060

6161
/**
6262
* App startup time.

0 commit comments

Comments
 (0)