Skip to content

Commit 9f6196d

Browse files
kenjiskenjis
authored
Merge pull request #9083 from codeigniter4/develop
4.5.4 Ready code
2 parents 9b27444 + dd03593 commit 9f6196d

File tree

89 files changed

+773
-463
lines changed

Some content is hidden

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

89 files changed

+773
-463
lines changed

‎.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CONTRIBUTING.md export-ignore
1717

1818
# contributor/development files
1919
tests/ export-ignore
20-
tools/ export-ignore
2120
utils/ export-ignore
2221
.php-cs-fixer.dist.php export-ignore
2322
.php-cs-fixer.no-header.php export-ignore

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ jobs:
9595
mssql:
9696
image: mcr.microsoft.com/mssql/server:2022-latest
9797
env:
98-
SA_PASSWORD: 1Secure*Password1
98+
MSSQL_SA_PASSWORD: 1Secure*Password1
9999
ACCEPT_EULA: Y
100100
MSSQL_PID: Developer
101101
ports:
102102
- 1433:1433
103103
options: >-
104-
--health-cmd="/opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q 'SELECT @@VERSION'"
104+
--health-cmd="/opt/mssql-tools18/bin/sqlcmd -C -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q 'SELECT @@VERSION'"
105105
--health-interval=10s
106106
--health-timeout=5s
107107
--health-retries=3

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,5 @@ jobs:
5757
- name: Install dependencies
5858
run: composer update --ansi --no-interaction
5959

60-
- name: Run lint on `app/`, `admin/`, `public/`
61-
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.no-header.php --using-cache=no --diff
62-
63-
- name: Run lint on `system/`, `utils/`, and root PHP files
64-
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff
65-
66-
- name: Run lint on `tests`
67-
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.tests.php --using-cache=no --diff
68-
69-
- name: Run lint on `user_guide_src/source/`
70-
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.user-guide.php --using-cache=no --diff
60+
- name: Run lint
61+
run: composer cs

‎.github/workflows/test-phpstan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ jobs:
8585
run: composer update --ansi --no-interaction
8686

8787
- name: Run static analysis
88-
run: vendor/bin/phpstan analyse
88+
run: composer phpstan:check

‎.github/workflows/test-psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
build:
2525
name: Psalm Analysis
2626
runs-on: ubuntu-latest
27-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
27+
if: (! contains(github.event.head_commit.message, '[ci skip]'))
2828

2929
steps:
3030
- name: Checkout
@@ -68,4 +68,4 @@ jobs:
6868
fi
6969
7070
- name: Run Psalm analysis
71-
run: vendor/bin/psalm
71+
run: utils/vendor/bin/psalm

‎.php-cs-fixer.dist.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
'ThirdParty',
2929
'Validation/Views',
3030
])
31-
->notPath([
32-
])
3331
->notName('#Foobar.php$#')
3432
->append([
3533
__FILE__,
@@ -41,17 +39,12 @@
4139
__DIR__ . '/spark',
4240
]);
4341

44-
$overrides = [
45-
// for updating to coding-standard
46-
'modernize_strpos' => true,
47-
'ordered_attributes' => ['order' => [], 'sort_algorithm' => 'alpha'],
48-
'php_unit_attributes' => true,
49-
];
42+
$overrides = [];
5043

5144
$options = [
5245
'cacheFile' => 'build/.php-cs-fixer.cache',
5346
'finder' => $finder,
54-
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
47+
'customFixers' => FixerGenerator::create('utils/vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
5548
'customRules' => [
5649
NoCodeSeparatorCommentFixer::name() => true,
5750
],

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

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
* the LICENSE file that was distributed with this source code.
1212
*/
1313

14-
use CodeIgniter\CodingStandard\CodeIgniter4;
15-
use Nexus\CsConfig\Factory;
16-
use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
17-
use Nexus\CsConfig\FixerGenerator;
14+
use PhpCsFixer\ConfigInterface;
1815
use PhpCsFixer\Finder;
1916

17+
/** @var ConfigInterface $config */
18+
$config = require __DIR__ . '/.php-cs-fixer.dist.php';
19+
2020
$finder = Finder::create()
2121
->files()
2222
->in([
@@ -30,19 +30,10 @@
3030
]);
3131

3232
$overrides = [
33-
// for updating to coding-standard
34-
'modernize_strpos' => true,
35-
'ordered_attributes' => ['order' => [], 'sort_algorithm' => 'alpha'],
36-
'php_unit_attributes' => true,
37-
];
38-
39-
$options = [
40-
'cacheFile' => 'build/.php-cs-fixer.no-header.cache',
41-
'finder' => $finder,
42-
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
43-
'customRules' => [
44-
NoCodeSeparatorCommentFixer::name() => true,
45-
],
33+
'header_comment' => false,
4634
];
4735

48-
return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
36+
return $config
37+
->setFinder($finder)
38+
->setCacheFile('build/.php-cs-fixer.no-header.cache')
39+
->setRules(array_merge($config->getRules(), $overrides));

‎.php-cs-fixer.tests.php

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,47 +11,29 @@
1111
* the LICENSE file that was distributed with this source code.
1212
*/
1313

14-
use CodeIgniter\CodingStandard\CodeIgniter4;
15-
use Nexus\CsConfig\Factory;
16-
use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
17-
use Nexus\CsConfig\FixerGenerator;
14+
use PhpCsFixer\ConfigInterface;
1815
use PhpCsFixer\Finder;
1916

17+
/** @var ConfigInterface $config */
18+
$config = require __DIR__ . '/.php-cs-fixer.dist.php';
19+
2020
$finder = Finder::create()
2121
->files()
2222
->in([
2323
__DIR__ . '/tests',
2424
])
25-
->exclude([
26-
])
2725
->notPath([
2826
'_support/View/Cells/multiplier.php',
2927
'_support/View/Cells/colors.php',
3028
'_support/View/Cells/addition.php',
3129
])
32-
->notName('#Foobar.php$#')
33-
->append([
34-
]);
30+
->notName('#Foobar.php$#');
3531

3632
$overrides = [
3733
'void_return' => true,
38-
// for updating to coding-standard
39-
'modernize_strpos' => true,
40-
'ordered_attributes' => ['order' => [], 'sort_algorithm' => 'alpha'],
41-
'php_unit_attributes' => true,
42-
];
43-
44-
$options = [
45-
'cacheFile' => 'build/.php-cs-fixer.tests.cache',
46-
'finder' => $finder,
47-
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
48-
'customRules' => [
49-
NoCodeSeparatorCommentFixer::name() => true,
50-
],
5134
];
5235

53-
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
54-
'CodeIgniter 4 framework',
55-
'CodeIgniter Foundation',
56-
'admin@codeigniter.com'
57-
);
36+
return $config
37+
->setFinder($finder)
38+
->setCacheFile('build/.php-cs-fixer.tests.cache')
39+
->setRules(array_merge($config->getRules(), $overrides));

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

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
* the LICENSE file that was distributed with this source code.
1212
*/
1313

14-
use CodeIgniter\CodingStandard\CodeIgniter4;
15-
use Nexus\CsConfig\Factory;
16-
use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
17-
use Nexus\CsConfig\FixerGenerator;
14+
use PhpCsFixer\ConfigInterface;
1815
use PhpCsFixer\Finder;
1916

17+
/** @var ConfigInterface $config */
18+
$config = require __DIR__ . '/.php-cs-fixer.dist.php';
19+
2020
$finder = Finder::create()
2121
->files()
2222
->in([
@@ -32,26 +32,17 @@
3232

3333
$overrides = [
3434
'echo_tag_syntax' => false,
35+
'header_comment' => false,
3536
'php_unit_internal_class' => false,
3637
'no_unused_imports' => false,
3738
'class_attributes_separation' => false,
3839
'fully_qualified_strict_types' => [
3940
'import_symbols' => false,
4041
'leading_backslash_in_global_namespace' => true,
4142
],
42-
// for updating to coding-standard
43-
'modernize_strpos' => true,
44-
'ordered_attributes' => ['order' => [], 'sort_algorithm' => 'alpha'],
45-
'php_unit_attributes' => true,
46-
];
47-
48-
$options = [
49-
'cacheFile' => 'build/.php-cs-fixer.user-guide.cache',
50-
'finder' => $finder,
51-
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
52-
'customRules' => [
53-
NoCodeSeparatorCommentFixer::name() => true,
54-
],
5543
];
5644

57-
return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
45+
return $config
46+
->setFinder($finder)
47+
->setCacheFile('build/.php-cs-fixer.user-guide.cache')
48+
->setRules(array_merge($config->getRules(), $overrides));

‎CHANGELOG.md

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

3+
## [v4.5.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.3) (2024-07-27)
4+
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.3...v4.5.4)
5+
6+
### Fixed Bugs
7+
8+
* fix: [OCI8] Easy Connect string validation by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9006
9+
* fix: [QueryBuilder] select() with RawSql may cause TypeError by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9009
10+
* fix: [QueryBuilder] `select()` does not escape after `NULL` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9010
11+
* fix: allow string as parameter to CURLRequest version by @tangix in https://github.com/codeigniter4/CodeIgniter4/pull/9021
12+
* fix: `spark phpini:check` may cause TypeError by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9026
13+
* fix: Prevent invalid session handlers by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/9036
14+
* fix: DebugBar CSS for daisyUI by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9046
15+
* docs: `referrer` is undefined by @totoprayogo1916 in https://github.com/codeigniter4/CodeIgniter4/pull/9059
16+
* fix: filters passed to the ``$routes->group()`` are not merged into the filters passed to the inner routes by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9064
17+
18+
### Refactoring
19+
20+
* refactor: use first class callable on function call by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/9004
21+
* refactor: enable AddClosureVoidReturnTypeWhereNoReturnRector to add void return on closure by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/9008
22+
* refactor: enable AddFunctionVoidReturnTypeWhereNoReturnRector to add void to functions by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/9014
23+
* refactor: Enable phpunit 10 attribute Rector rules by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/9015
24+
* refactor: fix `Throttler::check()` $tokens by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/9067
25+
326
## [v4.5.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.3) (2024-06-25)
427
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.2...v4.5.3)
528

0 commit comments

Comments
 (0)