Skip to content

Commit c668faf

Browse files
kenjiskenjis
authored
Merge pull request #7897 from codeigniter4/develop
4.4.1 Ready code
2 parents 9451595 + fe9c7ea commit c668faf

File tree

78 files changed

+550
-272
lines changed

Some content is hidden

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

78 files changed

+550
-272
lines changed

Diff for: ‎.github/workflows/deploy-apidocs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
git config --global user.name "${GITHUB_ACTOR}"
3030
3131
- name: Checkout source
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333
with:
3434
path: source
3535

3636
- name: Checkout target
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838
with:
3939
repository: codeigniter4/api
4040
token: ${{ secrets.ACCESS_TOKEN }}

Diff for: ‎.github/workflows/deploy-distributables.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0 # fetch all tags
2222

@@ -48,12 +48,12 @@ jobs:
4848
git config --global user.name "${GITHUB_ACTOR}"
4949
5050
- name: Checkout source
51-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
5252
with:
5353
path: source
5454

5555
- name: Checkout target
56-
uses: actions/checkout@v3
56+
uses: actions/checkout@v4
5757
with:
5858
repository: codeigniter4/framework
5959
token: ${{ secrets.ACCESS_TOKEN }}
@@ -98,12 +98,12 @@ jobs:
9898
git config --global user.name "${GITHUB_ACTOR}"
9999
100100
- name: Checkout source
101-
uses: actions/checkout@v3
101+
uses: actions/checkout@v4
102102
with:
103103
path: source
104104

105105
- name: Checkout target
106-
uses: actions/checkout@v3
106+
uses: actions/checkout@v4
107107
with:
108108
repository: codeigniter4/appstarter
109109
token: ${{ secrets.ACCESS_TOKEN }}
@@ -148,12 +148,12 @@ jobs:
148148
git config --global user.name "${GITHUB_ACTOR}"
149149
150150
- name: Checkout source
151-
uses: actions/checkout@v3
151+
uses: actions/checkout@v4
152152
with:
153153
path: source
154154

155155
- name: Checkout target
156-
uses: actions/checkout@v3
156+
uses: actions/checkout@v4
157157
with:
158158
repository: codeigniter4/userguide
159159
token: ${{ secrets.ACCESS_TOKEN }}

Diff for: ‎.github/workflows/deploy-userguide-latest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Setup PHP
3131
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/reusable-coveralls.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Setup PHP
2020
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/reusable-phpunit-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
sudo apt-get install --fix-broken
150150
151151
- name: Checkout
152-
uses: actions/checkout@v3
152+
uses: actions/checkout@v4
153153

154154
- name: Setup PHP
155155
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/reusable-serviceless-phpunit-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
sudo apt-get install --fix-broken
6262
6363
- name: Checkout
64-
uses: actions/checkout@v3
64+
uses: actions/checkout@v4
6565

6666
- name: Setup PHP
6767
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/test-autoreview.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939

4040
- name: Setup PHP
4141
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/test-coding-standards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Checkout
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737

3838
- name: Setup PHP
3939
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/test-deptrac.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-22.04
3838
steps:
3939
- name: Checkout
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
4141

4242
- name: Setup PHP
4343
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/test-phpcpd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ubuntu-22.04
3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4040

4141
- name: Setup PHP
4242
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/test-phpstan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
fail-fast: false
4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848

4949
- name: Setup PHP
5050
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/test-psalm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232

3333
- name: Setup PHP
3434
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/test-rector.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- utils
5454
steps:
5555
- name: Checkout
56-
uses: actions/checkout@v3
56+
uses: actions/checkout@v4
5757

5858
- name: Setup PHP
5959
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/test-scss.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Checkout
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737

3838
- name: Setup Node
3939
uses: actions/[email protected]

Diff for: ‎.github/workflows/test-userguide.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Detect usage of tabs in RST files
3030
run: php utils/check_tabs_in_rst.php

Diff for: ‎CHANGELOG.md

+15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## [v4.4.1](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.1) (2023-09-05)
4+
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.0...v4.4.1)
5+
6+
### Fixed Bugs
7+
8+
* docs: add missing Config updates for Hot Reloading by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7862
9+
* fix: auto route legacy does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7871
10+
* fix: Factories may not return shared instance by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7868
11+
* fix: replace `config(DocTypes::class)` with `new DocTypes()` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7872
12+
* fix: FeatureTest may cause risky tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7867
13+
* fix: reverse routing causes ErrorException by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7880
14+
* fix: Email library forces to switch to TLS when setting port 465 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7883
15+
* fix: [DebugBar] make CSS rotate class less broad by @sanchawebo in https://github.com/codeigniter4/CodeIgniter4/pull/7882
16+
* fix: FeatureTest fails when forceGlobalSecureRequests is true by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7890
17+
318
## [v4.4.0](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.0) (2023-08-25)
419
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.8...v4.4.0)
520

Diff for: ‎admin/RELEASE.md

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
If you release a new minor version.
1212

1313
* Create PR to merge `4.x` into `develop` and merge it
14+
* Rename the current minor version (e.g., `4.4`) in Setting > Branches >
15+
"Branch protection rules" to the next minor version. E.g. `4.4` → `4.5`
1416
* Delete the merged `4.x` branch (This closes all PRs to the branch)
1517
* Do the regular release process. Go to the next "Changelog" section
1618

@@ -77,6 +79,7 @@ the existing content.
7779
* fill in the "All Changes" section, and add it to **upgrading.rst**
7880
* git diff --name-status origin/master -- . ':!system'
7981
* Remove the section titles that have no items
82+
* Update the "from" version in the title. E.g., `from 4.3.x` → `from 4.3.8`
8083
* Commit the changes with `Prep for 4.x.x release` and push to origin
8184
* Create a new PR from `release-4.x.x` to `develop`:
8285
* Title: `Prep for 4.x.x release`
@@ -113,6 +116,8 @@ the existing content.
113116
* "[Deploy Distributable Repos](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/deploy-distributables.yml)", the main repo
114117
* "[Deploy Production](https://github.com/codeigniter4/userguide/actions/workflows/deploy.yml)", UG repo
115118
* "[pages-build-deployment](https://github.com/codeigniter4/userguide/actions/workflows/pages/pages-build-deployment)", UG repo
119+
* Check if "CodeIgniter4.x.x.epub" is added to UG repo. "CodeIgniter.epub" was
120+
created when v4.3.8 was released.
116121
* Fast-forward `develop` branch to catch the merge commit from `master`
117122
```console
118123
git fetch origin

Diff for: ‎admin/css/debug-toolbar/toolbar.scss

+9-10
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,15 @@
202202
// Give room for OS X scrollbar
203203
white-space: nowrap;
204204
z-index: 10000;
205+
// Endless rotate
206+
.rotate {
207+
animation: toolbar-rotate 9s linear infinite;
208+
}
209+
@keyframes toolbar-rotate {
210+
to {
211+
transform: rotate(360deg);
212+
}
213+
}
205214
}
206215

207216
// Fixed top
@@ -501,13 +510,3 @@
501510
.debug-bar-noverflow {
502511
overflow: hidden;
503512
}
504-
505-
/* ENDLESS ROTATE */
506-
.rotate {
507-
animation: rotate 9s linear infinite;
508-
}
509-
@keyframes rotate {
510-
to {
511-
transform: rotate(360deg);
512-
}
513-
}

Diff for: ‎app/Config/Autoload.php

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
*
1818
* NOTE: This class is required prior to Autoloader instantiation,
1919
* and does not extend BaseConfig.
20+
*
21+
* @immutable
2022
*/
2123
class Autoload extends AutoloadConfig
2224
{

Diff for: ‎app/Config/DocTypes.php

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Config;
44

5+
/**
6+
* @immutable
7+
*/
58
class DocTypes
69
{
710
/**

Diff for: ‎app/Config/Email.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ class Email extends BaseConfig
5656
public bool $SMTPKeepAlive = false;
5757

5858
/**
59-
* SMTP Encryption. Either tls or ssl
59+
* SMTP Encryption.
60+
*
61+
* @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
62+
* to the server. 'ssl' means implicit SSL. Connection on port
63+
* 465 should set this to ''.
6064
*/
6165
public string $SMTPCrypto = 'tls';
6266

Diff for: ‎app/Config/ForeignCharacters.php

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters;
66

7+
/**
8+
* @immutable
9+
*/
710
class ForeignCharacters extends BaseForeignCharacters
811
{
912
}

Diff for: ‎app/Config/Mimes.php

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*
1616
* When working with mime types, please make sure you have the ´fileinfo´
1717
* extension enabled to reliably detect the media types.
18+
*
19+
* @immutable
1820
*/
1921
class Mimes
2022
{

Diff for: ‎app/Config/Modules.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
*
1010
* NOTE: This class is required prior to Autoloader instantiation,
1111
* and does not extend BaseConfig.
12+
*
13+
* @immutable
1214
*/
1315
class Modules extends BaseModules
1416
{

Diff for: ‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"phpunit/phpcov": "^8.2",
3131
"phpunit/phpunit": "^9.1",
3232
"predis/predis": "^1.1 || ^2.0",
33-
"rector/rector": "0.18.0",
33+
"rector/rector": "0.18.1",
3434
"vimeo/psalm": "^5.0"
3535
},
3636
"suggest": {

0 commit comments

Comments
 (0)