Skip to content

Commit f2907b9

Browse files
authored
Merge pull request #9836 from codeigniter4/develop
4.6.4 Ready code
2 parents ec20327 + cc229a6 commit f2907b9

File tree

237 files changed

+2116
-1529
lines changed

Some content is hidden

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

237 files changed

+2116
-1529
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ Each pull request should address a single issue and have a meaningful title.
55
- PR title must include the type (feat, fix, chore, docs, perf, refactor, style, test) of the commit per Conventional Commits specification. See https://www.conventionalcommits.org/en/v1.0.0/ for the discussion.
66
- Pull requests must be in English.
77
- If a pull request fixes an issue, reference the issue with a suitable keyword (e.g., Fixes <issue number>).
8+
- Your branch name and the target name should be different.
89
- All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
9-
- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.5"__
10+
- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.7"__
1011
1112
-->
1213
**Description**
1314
Explain what you have changed, and why.
1415

1516
**Checklist:**
1617
- [ ] Securely signed commits
17-
- [ ] Component(s) with PHPDoc blocks, only if necessary or adds value
18+
- [ ] Component(s) with PHPDoc blocks, only if necessary or adds value (without duplication)
1819
- [ ] Unit testing, with >80% coverage
1920
- [ ] User guide updated
2021
- [ ] Conforms to style guide

.github/mergeable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mergeable:
1616
regex: '### CodeIgniter4 Version'
1717
- do: author
1818
must_include:
19-
regex: ^kenjis|lonnieezell|MGatner|michalsn|paulbalandan|samsonasik$
19+
regex: ^kenjis|lonnieezell|MGatner|michalsn|paulbalandan|samsonasik|ddevsr$
2020
fail:
2121
- do: comment
2222
payload:

.github/workflows/deploy-apidocs.yml

Lines changed: 2 additions & 2 deletions
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@v4
32+
uses: actions/checkout@v6
3333
with:
3434
path: source
3535

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

.github/workflows/deploy-distributables.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
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@v4
51+
uses: actions/checkout@v6
5252
with:
5353
path: source
5454

5555
- name: Checkout target
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v6
5757
with:
5858
repository: codeigniter4/framework
5959
token: ${{ secrets.ACCESS_TOKEN }}
@@ -66,7 +66,7 @@ jobs:
6666
run: ./source/.github/scripts/deploy-framework ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/framework ${GITHUB_REF##*/}
6767

6868
- name: Release
69-
uses: actions/github-script@v7
69+
uses: actions/github-script@v8
7070
with:
7171
github-token: ${{secrets.ACCESS_TOKEN}}
7272
script: |
@@ -98,12 +98,12 @@ jobs:
9898
git config --global user.name "${GITHUB_ACTOR}"
9999
100100
- name: Checkout source
101-
uses: actions/checkout@v4
101+
uses: actions/checkout@v6
102102
with:
103103
path: source
104104

105105
- name: Checkout target
106-
uses: actions/checkout@v4
106+
uses: actions/checkout@v6
107107
with:
108108
repository: codeigniter4/appstarter
109109
token: ${{ secrets.ACCESS_TOKEN }}
@@ -116,7 +116,7 @@ jobs:
116116
run: ./source/.github/scripts/deploy-appstarter ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/appstarter ${GITHUB_REF##*/}
117117

118118
- name: Release
119-
uses: actions/github-script@v7
119+
uses: actions/github-script@v8
120120
with:
121121
github-token: ${{secrets.ACCESS_TOKEN}}
122122
script: |
@@ -148,19 +148,19 @@ jobs:
148148
git config --global user.name "${GITHUB_ACTOR}"
149149
150150
- name: Checkout source
151-
uses: actions/checkout@v4
151+
uses: actions/checkout@v6
152152
with:
153153
path: source
154154

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

162162
- name: Setup Python
163-
uses: actions/setup-python@v5
163+
uses: actions/setup-python@v6
164164
with:
165165
python-version: '3.12'
166166

@@ -176,7 +176,7 @@ jobs:
176176
run: ./source/.github/scripts/deploy-userguide ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/userguide ${GITHUB_REF##*/}
177177

178178
- name: Release
179-
uses: actions/github-script@v7
179+
uses: actions/github-script@v8
180180
with:
181181
github-token: ${{secrets.ACCESS_TOKEN}}
182182
script: |

.github/workflows/deploy-userguide-latest.yml

Lines changed: 4 additions & 4 deletions
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@v4
28+
uses: actions/checkout@v6
2929

3030
- name: Setup PHP
3131
uses: shivammathur/setup-php@v2
@@ -34,7 +34,7 @@ jobs:
3434
coverage: none
3535

3636
- name: Setup Python
37-
uses: actions/setup-python@v5
37+
uses: actions/setup-python@v6
3838
with:
3939
python-version: '3.12'
4040

@@ -57,7 +57,7 @@ jobs:
5757
5858
# Create an artifact of the html output
5959
- name: Upload artifact
60-
uses: actions/upload-artifact@v4
60+
uses: actions/upload-artifact@v5
6161
with:
6262
name: HTML Documentation
6363
path: user_guide_src/build/html/
@@ -75,7 +75,7 @@ jobs:
7575
git commit -m "Update User Guide" -a || true
7676
7777
- name: Push changes
78-
uses: ad-m/github-push-action@v0.6.0
78+
uses: ad-m/github-push-action@v1.0.0
7979
with:
8080
branch: gh-pages
8181
directory: gh-pages

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121

2222
- name: Get PR List
2323
id: PR-list

.github/workflows/label-signing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323

2424
- name: Check signed commits in PR
2525
uses: 1Password/check-signed-commits-action@v1

.github/workflows/reusable-coveralls.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
steps:
1616
- name: Checkout base branch for PR
1717
if: github.event_name == 'pull_request'
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
with:
2020
ref: ${{ github.base_ref }}
2121

2222
- name: Checkout
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424

2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
@@ -30,7 +30,7 @@ jobs:
3030
coverage: xdebug
3131

3232
- name: Download coverage files
33-
uses: actions/download-artifact@v4
33+
uses: actions/download-artifact@v6
3434
with:
3535
path: build/cov
3636

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ jobs:
150150
151151
- name: Checkout base branch for PR
152152
if: github.event_name == 'pull_request'
153-
uses: actions/checkout@v4
153+
uses: actions/checkout@v6
154154
with:
155155
ref: ${{ github.base_ref }}
156156

157157
- name: Checkout
158-
uses: actions/checkout@v4
158+
uses: actions/checkout@v6
159159

160160
- name: Setup PHP
161161
uses: shivammathur/setup-php@v2
@@ -212,7 +212,7 @@ jobs:
212212

213213
- name: Upload coverage results as artifact
214214
if: ${{ inputs.enable-artifact-upload }}
215-
uses: actions/upload-artifact@v4
215+
uses: actions/upload-artifact@v5
216216
with:
217217
name: ${{ env.ARTIFACT_NAME }}
218218
path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ jobs:
6262
6363
- name: Checkout base branch for PR
6464
if: github.event_name == 'pull_request'
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v6
6666
with:
6767
ref: ${{ github.base_ref }}
6868

6969
- name: Checkout
70-
uses: actions/checkout@v4
70+
uses: actions/checkout@v6
7171

7272
- name: Setup PHP
7373
uses: shivammathur/setup-php@v2
@@ -122,7 +122,7 @@ jobs:
122122

123123
- name: Upload coverage results as artifact
124124
if: ${{ inputs.enable-artifact-upload }}
125-
uses: actions/upload-artifact@v4
125+
uses: actions/upload-artifact@v5
126126
with:
127127
name: ${{ env.ARTIFACT_NAME }}
128128
path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

0 commit comments

Comments
 (0)