Skip to content

Commit 432d724

Browse files
kenjiskenjis
authored
Merge pull request #8783 from codeigniter4/develop
4.5.1 Ready code
2 parents c4a89e1 + 2b77a0b commit 432d724

File tree

106 files changed

+1161
-2565
lines changed

Some content is hidden

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

106 files changed

+1161
-2565
lines changed

‎.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ writable/uploads/*
6161
!writable/uploads/index.html
6262

6363
writable/debugbar/*
64-
!writable/debugbar/.gitkeep
64+
!writable/debugbar/index.html
6565

6666
writable/**/*.db
6767
writable/**/*.sqlite
@@ -125,7 +125,5 @@ nb-configuration.xml
125125

126126
/results/
127127
/phpunit*.xml
128-
/.phpunit.*.cache
129-
/.phpunit.cache
130128

131129
/.php-cs-fixer.php

‎.php-cs-fixer.dist.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
->files()
2222
->in([
2323
__DIR__ . '/system',
24-
__DIR__ . '/tests',
2524
__DIR__ . '/utils',
2625
])
2726
->exclude([
@@ -30,14 +29,12 @@
3029
'Validation/Views',
3130
])
3231
->notPath([
33-
'_support/View/Cells/multiplier.php',
34-
'_support/View/Cells/colors.php',
35-
'_support/View/Cells/addition.php',
3632
])
3733
->notName('#Foobar.php$#')
3834
->append([
3935
__FILE__,
4036
__DIR__ . '/.php-cs-fixer.no-header.php',
37+
__DIR__ . '/.php-cs-fixer.tests.php',
4138
__DIR__ . '/.php-cs-fixer.user-guide.php',
4239
__DIR__ . '/rector.php',
4340
__DIR__ . '/spark',

‎.php-cs-fixer.tests.php

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* This file is part of CodeIgniter 4 framework.
7+
*
8+
* (c) CodeIgniter Foundation <admin@codeigniter.com>
9+
*
10+
* For the full copyright and license information, please view
11+
* the LICENSE file that was distributed with this source code.
12+
*/
13+
14+
use CodeIgniter\CodingStandard\CodeIgniter4;
15+
use Nexus\CsConfig\Factory;
16+
use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
17+
use Nexus\CsConfig\FixerGenerator;
18+
use PhpCsFixer\Finder;
19+
20+
$finder = Finder::create()
21+
->files()
22+
->in([
23+
__DIR__ . '/tests',
24+
])
25+
->exclude([
26+
])
27+
->notPath([
28+
'_support/View/Cells/multiplier.php',
29+
'_support/View/Cells/colors.php',
30+
'_support/View/Cells/addition.php',
31+
])
32+
->notName('#Foobar.php$#')
33+
->append([
34+
]);
35+
36+
$overrides = [
37+
'void_return' => true,
38+
];
39+
40+
$options = [
41+
'cacheFile' => 'build/.php-cs-fixer.tests.cache',
42+
'finder' => $finder,
43+
];
44+
45+
$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
46+
'CodeIgniter 4 framework',
47+
'CodeIgniter Foundation',
48+
'admin@codeigniter.com'
49+
);
50+
51+
$config
52+
->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
53+
->setRules(array_merge($config->getRules(), [
54+
NoCodeSeparatorCommentFixer::name() => true,
55+
]));
56+
57+
return $config;

‎CHANGELOG.md

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

3+
## [v4.5.1](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.1) (2024-04-14)
4+
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.0...v4.5.1)
5+
6+
### Fixed Bugs
7+
8+
* fix: TypeError in form() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8736
9+
* fix: [DebugBar] TypeError in Toolbar by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8727
10+
* fix: TypeError when Time is passed to Model by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8738
11+
* docs: added Config\Feature::$oldFilterOrder to app/Config/Feature.php… by @mullernato in https://github.com/codeigniter4/CodeIgniter4/pull/8749
12+
* fix: Factories::get() cannot get defined classes by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8744
13+
* fix: `BaseConnection::escape()` does not accept Stringable by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8756
14+
* fix: [CURLRequest] `getHeaderLine('Content-Type')` causes InvalidArgumentException by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8760
15+
* fix: [CURLRequest] construct param $config is not used by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8761
16+
* fix: [FileLocator] Cannot declare class XXX, because the name is already in use by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8745
17+
* fix: [DebugBar] Toolbar display may be broken by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8772
18+
* fix: Cannot declare class CodeIgniter\Config\Services, because the name is already in use by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8776
19+
* docs: fix Postgre DSN sample by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8774
20+
21+
### Refactoring
22+
23+
* test: refactor Config/Registrar.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8731
24+
* test: add return void by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8746
25+
* refactor: system/CLI/BaseCommand.php by @mcsaygili in https://github.com/codeigniter4/CodeIgniter4/pull/8741
26+
* refactor: system/View/Plugins.php by @mcsaygili in https://github.com/codeigniter4/CodeIgniter4/pull/8742
27+
* refactor: fix method name `ValidationErrors` in View\Plugins by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8758
28+
* refactor: system/Debug/Toolbar/Collectors/Routes.php by @mcsaygili in https://github.com/codeigniter4/CodeIgniter4/pull/8751
29+
* refactor: improve error message in BaseExceptionHandler by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8766
30+
* refactor: FabricatorModel by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8770
31+
332
## [v4.5.0](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.0) (2024-04-07)
433
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.8...v4.5.0)
534

‎admin/RELEASE.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
> Documentation guide based on the releases of `4.0.5` and `4.1.0` on January 31, 2021.
44
>
5-
> Updated for `4.4.3` on October 27, 2023.
5+
> Updated for `4.5.0` on April 7, 2024.
66
>
77
> -MGatner, kenjis
88
@@ -25,10 +25,10 @@ git push upstream HEAD
2525
If you release a new minor version.
2626

2727
* [ ] Create PR to merge `4.x` into `develop` and merge it
28-
* [ ] Rename the current minor version (e.g., `4.4`) in Setting > Branches >
29-
"Branch protection rules" to the next minor version. E.g. `4.4` → `4.5`
28+
* [ ] Rename the current minor version (e.g., `4.5`) in Setting > Branches >
29+
"Branch protection rules" to the next minor version. E.g. `4.5` → `4.6`
3030
* [ ] Delete the merged `4.x` branch (This closes all PRs to the branch)
31-
* [ ] Do the regular release process. Go to the next "Changelog" section
31+
* Do the regular release process. Go to the next "Changelog" section
3232

3333
## Changelog
3434

@@ -91,10 +91,11 @@ Work off direct clones of the repos so the release branches persist for a time.
9191
* [ ] Update **user_guide_src/source/changelogs/v4.x.x.rst**
9292
* Remove the section titles that have no items
9393
* [ ] Update **user_guide_src/source/installation/upgrade_{ver}.rst**
94-
* fill in the "All Changes" section, and add it to **upgrading.rst**
95-
* git diff --name-status origin/master -- . ':!system'
96-
* Remove the section titles that have no items
97-
* [Minor version only] Update the "from" version in the title. E.g., `from 4.3.x` → `from 4.3.8`
94+
* [ ] fill in the "All Changes" section, and add it to **upgrading.rst**
95+
* git diff --name-status origin/master -- . ':!system' ':!tests' ':!user_guide_src'
96+
* Note: `tests/` is not used for distribution repos. See `admin/starter/tests/`
97+
* [ ] Remove the section titles that have no items
98+
* [ ] [Minor version only] Update the "from" version in the title. E.g., `from 4.3.x` → `from 4.3.8`
9899
* [ ] Run `php admin/prepare-release.php 4.x.x` and push to origin
99100
* The above command does the following:
100101
* Create a new branch `release-4.x.x`

‎admin/create-new-changelog.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ function replace_file_content(string $path, string $pattern, string $replace): v
2929
$isMinorUpdate = ($minorCurrent !== $minor);
3030

3131
// Creates a branch for release.
32-
system('git switch develop');
32+
if (! $isMinorUpdate) {
33+
system('git switch develop');
34+
}
3335
system('git switch -c docs-changelog-' . $version);
3436
system('git switch docs-changelog-' . $version);
3537

‎admin/css/debug-toolbar/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
See [contributing/css.md](../../../contributing/css.md).

‎admin/css/debug-toolbar/toolbar.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
width: 36px;
2929

3030
// Spacing
31-
margin: 0px;
32-
padding: 0px;
31+
margin: 0;
32+
padding: 0;
3333

3434
// Content
3535
clear: both;
@@ -85,6 +85,8 @@
8585
display: flex;
8686
font-weight: normal;
8787
margin: 0 0 0 auto;
88+
padding: 0;
89+
font-family: $base-font;
8890

8991
svg {
9092
width: 16px;

‎admin/framework/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,3 @@ nb-configuration.xml
124124

125125
/results/
126126
/phpunit*.xml
127-
/.phpunit.*.cache
128-

‎admin/framework/phpunit.xml.dist

Lines changed: 61 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,63 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="system/Test/bootstrap.php" backupGlobals="false" colors="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
3-
<coverage includeUncoveredFiles="true">
4-
<report>
5-
<clover outputFile="build/logs/clover.xml"/>
6-
<html outputDirectory="build/logs/html"/>
7-
<php outputFile="build/logs/coverage.serialized"/>
8-
<text outputFile="php://stdout" showUncoveredFiles="false"/>
9-
</report>
10-
</coverage>
11-
<testsuites>
12-
<testsuite name="App">
13-
<directory>./tests</directory>
14-
</testsuite>
15-
</testsuites>
16-
<logging>
17-
<testdoxHtml outputFile="build/logs/testdox.html"/>
18-
<testdoxText outputFile="build/logs/testdox.txt"/>
19-
<junit outputFile="build/logs/logfile.xml"/>
20-
</logging>
21-
<php>
22-
<server name="app.baseURL" value="http://example.com/"/>
23-
<!-- Directory containing phpunit.xml -->
24-
<const name="HOMEPATH" value="./"/>
25-
<!-- Directory containing the Paths config file -->
26-
<const name="CONFIGPATH" value="./app/Config/"/>
27-
<!-- Directory containing the front controller (index.php) -->
28-
<const name="PUBLICPATH" value="./public/"/>
29-
<!-- Database configuration -->
30-
<!-- Uncomment to provide your own database for testing
31-
<env name="database.tests.hostname" value="localhost"/>
32-
<env name="database.tests.database" value="tests"/>
33-
<env name="database.tests.username" value="tests_user"/>
34-
<env name="database.tests.password" value=""/>
35-
<env name="database.tests.DBDriver" value="MySQLi"/>
36-
<env name="database.tests.DBPrefix" value="tests_"/>
37-
-->
38-
</php>
39-
<source>
40-
<include>
41-
<directory suffix=".php">./app</directory>
42-
</include>
43-
<exclude>
44-
<directory suffix=".php">./app/Views</directory>
45-
<file>./app/Config/Routes.php</file>
46-
</exclude>
47-
</source>
2+
<phpunit
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
5+
bootstrap="system/Test/bootstrap.php"
6+
backupGlobals="false"
7+
beStrictAboutOutputDuringTests="true"
8+
colors="true"
9+
columns="max"
10+
failOnRisky="true"
11+
failOnWarning="true"
12+
cacheDirectory="build/.phpunit.cache">
13+
<coverage
14+
includeUncoveredFiles="true"
15+
pathCoverage="false"
16+
ignoreDeprecatedCodeUnits="true"
17+
disableCodeCoverageIgnore="true">
18+
<report>
19+
<clover outputFile="build/logs/clover.xml"/>
20+
<html outputDirectory="build/logs/html"/>
21+
<php outputFile="build/logs/coverage.serialized"/>
22+
<text outputFile="php://stdout" showUncoveredFiles="false"/>
23+
</report>
24+
</coverage>
25+
<testsuites>
26+
<testsuite name="App">
27+
<directory>./tests</directory>
28+
</testsuite>
29+
</testsuites>
30+
<logging>
31+
<testdoxHtml outputFile="build/logs/testdox.html"/>
32+
<testdoxText outputFile="build/logs/testdox.txt"/>
33+
<junit outputFile="build/logs/logfile.xml"/>
34+
</logging>
35+
<source>
36+
<include>
37+
<directory suffix=".php">./app</directory>
38+
</include>
39+
<exclude>
40+
<directory suffix=".php">./app/Views</directory>
41+
<file>./app/Config/Routes.php</file>
42+
</exclude>
43+
</source>
44+
<php>
45+
<server name="app.baseURL" value="http://example.com/"/>
46+
<server name="CODEIGNITER_SCREAM_DEPRECATIONS" value="0"/>
47+
<!-- Directory containing phpunit.xml -->
48+
<const name="HOMEPATH" value="./"/>
49+
<!-- Directory containing the Paths config file -->
50+
<const name="CONFIGPATH" value="./app/Config/"/>
51+
<!-- Directory containing the front controller (index.php) -->
52+
<const name="PUBLICPATH" value="./public/"/>
53+
<!-- Database configuration -->
54+
<!-- Uncomment to provide your own database for testing
55+
<env name="database.tests.hostname" value="localhost"/>
56+
<env name="database.tests.database" value="tests"/>
57+
<env name="database.tests.username" value="tests_user"/>
58+
<env name="database.tests.password" value=""/>
59+
<env name="database.tests.DBDriver" value="MySQLi"/>
60+
<env name="database.tests.DBPrefix" value="tests_"/>
61+
-->
62+
</php>
4863
</phpunit>

‎admin/starter/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,3 @@ nb-configuration.xml
124124

125125
/results/
126126
/phpunit*.xml
127-
/.phpunit.*.cache
128-

0 commit comments

Comments
 (0)