Skip to content

Commit b0b7ecb

Browse files
authored
Merge pull request #9174 from codeigniter4/develop
4.5.5 Ready code
2 parents 9f6196d + ae63c75 commit b0b7ecb

File tree

95 files changed

+959
-810
lines changed

Some content is hidden

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

95 files changed

+959
-810
lines changed

.github/workflows/label-add-conflict-all-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ jobs:
4646
gh pr edit $url --add-label "stale"
4747
4848
# Add a comment
49-
gh pr comment $url --body ":wave: Hi, @$author!<br><br>We detected conflicts in your PR against the base branch :speak_no_evil:<br>You may want to sync :arrows_counterclockwise: your branch with upstream!<br><br>Ref: [Syncing Your Branch](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch)"
49+
gh pr comment $url --body ":wave: Hi, @$author!<br><br>We detected conflicts in your PR against the base branch :speak_no_evil:<br>You may want to sync :arrows_counterclockwise: your branch with upstream!<br><br>Ref: [Syncing Your Branch](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch)"
5050
fi
5151
done

.github/workflows/test-phpcpd.yml

+17-37
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- 'public/**.php'
1313
- 'system/**.php'
1414
- '.github/workflows/test-phpcpd.yml'
15-
1615
push:
1716
branches:
1817
- 'develop'
@@ -23,40 +22,21 @@ on:
2322
- 'system/**.php'
2423
- '.github/workflows/test-phpcpd.yml'
2524

26-
concurrency:
27-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
28-
cancel-in-progress: true
29-
30-
permissions:
31-
contents: read
32-
3325
jobs:
34-
build:
35-
name: Duplicate Code Detection
36-
runs-on: ubuntu-22.04
37-
steps:
38-
- name: Checkout
39-
uses: actions/checkout@v4
40-
41-
- name: Setup PHP
42-
uses: shivammathur/setup-php@v2
43-
with:
44-
php-version: '8.1'
45-
tools: phpcpd
46-
extensions: dom, mbstring
47-
48-
- name: Detect code duplication
49-
run: phpcpd
50-
--exclude system/Test
51-
--exclude system/ThirdParty
52-
--exclude system/Database/SQLSRV/Builder.php
53-
--exclude system/Database/SQLSRV/Forge.php
54-
--exclude system/Database/MySQLi/Builder.php
55-
--exclude system/Database/OCI8/Builder.php
56-
--exclude system/Database/Postgre/Builder.php
57-
--exclude system/Debug/Exceptions.php
58-
--exclude system/HTTP/SiteURI.php
59-
--exclude system/Validation/Rules.php
60-
--exclude system/Autoloader/Autoloader.php
61-
--exclude system/Config/Filters.php
62-
-- app/ public/ system/
26+
phpcpd:
27+
uses: codeigniter4/.github/.github/workflows/phpcpd.yml@main
28+
with:
29+
dirs: "app/ public/ system/"
30+
options: >-
31+
--exclude system/Test
32+
--exclude system/ThirdParty
33+
--exclude system/Database/SQLSRV/Builder.php
34+
--exclude system/Database/SQLSRV/Forge.php
35+
--exclude system/Database/MySQLi/Builder.php
36+
--exclude system/Database/OCI8/Builder.php
37+
--exclude system/Database/Postgre/Builder.php
38+
--exclude system/Debug/Exceptions.php
39+
--exclude system/HTTP/SiteURI.php
40+
--exclude system/Validation/Rules.php
41+
--exclude system/Autoloader/Autoloader.php
42+
--exclude system/Config/Filters.php

CHANGELOG.md

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
# Changelog
22

3-
## [v4.5.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.3) (2024-07-27)
3+
## [v4.5.5](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.5) (2024-09-07)
4+
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.4...v4.5.5)
5+
6+
### Fixed Bugs
7+
8+
* fix: Validation rule `differs`/`matches` with dot array by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9103
9+
* fix: update preload.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9111
10+
* fix: [Validation] TypeError when using numeric field names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9142
11+
* fix: `auto_link()` regexp by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9169
12+
13+
### Refactoring
14+
15+
* refactor: reduce_multiples() and fix user guide by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9099
16+
* refactor: enable AddMethodCallBasedStrictParamTypeRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/9156
17+
* refactor: BaseBuilder by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9157
18+
* refactor: improve error message for missing PHP DB extensions by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/9160
19+
* refactor: fix typo in BaseConnection.php by @ThomasMeschke in https://github.com/codeigniter4/CodeIgniter4/pull/9170
20+
21+
## [v4.5.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.4) (2024-07-27)
422
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.3...v4.5.4)
523

624
### Fixed Bugs

admin/framework/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"kint-php/kint": "^5.0.4",
2424
"mikey179/vfsstream": "^1.6",
2525
"nexusphp/cs-config": "^3.6",
26-
"phpunit/phpunit": "^10.5.16",
26+
"phpunit/phpunit": "^10.5.16 || ^11.2",
2727
"predis/predis": "^1.1 || ^2.0"
2828
},
2929
"suggest": {

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"phpstan/extension-installer": "^1.4",
2626
"phpstan/phpstan": "^1.11",
2727
"phpstan/phpstan-strict-rules": "^1.6",
28-
"phpunit/phpcov": "^9.0.2",
29-
"phpunit/phpunit": "^10.5.16",
28+
"phpunit/phpcov": "^9.0.2 || ^10.0",
29+
"phpunit/phpunit": "^10.5.16 || ^11.2",
3030
"predis/predis": "^1.1 || ^2.0",
31-
"rector/rector": "1.2.2"
31+
"rector/rector": "1.2.4"
3232
},
3333
"replace": {
3434
"codeigniter4/framework": "self.version"

contributing/internals.md

+6-7
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ projects outside of CodeIgniter. Basically, this means that any
1313
dependencies should be kept to a minimum. Any dependencies must be able
1414
to be passed into the constructor. If you do need to use one of the
1515
other core packages, you can create that in the constructor using the
16-
`Services` class, as long as you provide a way for dependencies to
16+
`service()` function, as long as you provide a way for dependencies to
1717
override that:
1818

1919
```php
2020
public function __construct(?Foo $foo = null)
2121
{
22-
$this->foo = $foo ?? \Config\Services::foo();
22+
$this->foo = $foo ?? service('foo');
2323
}
2424
```
2525

26-
## Type declarations
26+
## Type Declarations
2727

2828
PHP7 provides [Type declarations](https://www.php.net/manual/en/language.types.declarations.php)
2929
for method parameters and return types. Use it where possible. Return type
@@ -112,10 +112,9 @@ should generally match the package name.
112112

113113
## Autoloader
114114

115-
All files within the package should be added to
116-
**system/Config/AutoloadConfig.php**, in the "classmap" property. This
117-
is only used for core framework files, and helps to minimize file system
118-
scans and keep performance high.
115+
All source files within the **system/ThirdParty** should be added to
116+
**system/Config/AutoloadConfig.php**, in the `$coreClassmap` property. This
117+
is only used for loading the third party packages without Composer.
119118

120119
## Command-Line Support
121120

contributing/pull_request.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ PHPStan is expected to scan the entire framework by running this command in your
260260
terminal:
261261

262262
```console
263-
vendor/bin/phpstan analyse
263+
composer phpstan:check
264264
```
265265

266266
See also:
@@ -272,7 +272,7 @@ false positive and should be ignored, the baseline can be updated with the follo
272272
command:
273273

274274
```console
275-
vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php
275+
composer phpstan:baseline
276276
```
277277

278278
#### Rector

contributing/workflow.md

+7
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,13 @@ You might get conflicts when you rebase. It is your
354354
responsibility to resolve those locally, so that you can continue
355355
collaborating with the shared repository.
356356

357+
Occasionally, the Composer packages for development may be updated. Run the
358+
following command to use the latest packages:
359+
360+
```console
361+
composer update
362+
```
363+
357364
And finally push your local branch to your GitHub repository:
358365

359366
```console

phpdoc.dist.xml

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

0 commit comments

Comments
 (0)