Skip to content

Commit 2bd0f01

Browse files
paulbalandanpaulbalandan
authored
Merge pull request #10380 from codeigniter4/develop
4.7.4 Ready code
2 parents 7231622 + cf49152 commit 2bd0f01

174 files changed

Lines changed: 3227 additions & 1749 deletions

File tree

Some content is hidden

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

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ structarmed.php export-ignore
2626
phpmetrics.json export-ignore
2727
phpstan-baseline.php export-ignore
2828
phpstan-bootstrap.php export-ignore
29-
phpstan.neon.dist export-ignore
29+
phpstan.dist.neon export-ignore
3030
phpunit.dist.xml export-ignore
3131
psalm-baseline.xml export-ignore
3232
psalm.xml export-ignore

‎.github/workflows/deploy-apidocs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ jobs:
3030
git config --global user.name "${GITHUB_ACTOR}"
3131
3232
- name: Checkout source
33-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
33+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3434
with:
3535
path: source
3636
persist-credentials: false
3737

3838
- name: Checkout target
39-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
39+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4040
with:
4141
repository: codeigniter4/api
4242
token: ${{ secrets.ACCESS_TOKEN }}
4343
path: api
4444
persist-credentials: false
4545

4646
- name: Setup PHP
47-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
47+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
4848
with:
4949
php-version: '8.2'
5050
tools: phive

‎.github/workflows/deploy-distributables.yml‎

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

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2020
with:
2121
fetch-depth: 0 # fetch all tags
2222
persist-credentials: false
@@ -50,13 +50,13 @@ jobs:
5050
git config --global user.name "${GITHUB_ACTOR}"
5151
5252
- name: Checkout source
53-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
53+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5454
with:
5555
path: source
5656
persist-credentials: false
5757

5858
- name: Checkout target
59-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
59+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6060
with:
6161
repository: codeigniter4/framework
6262
token: ${{ secrets.ACCESS_TOKEN }}
@@ -104,13 +104,13 @@ jobs:
104104
git config --global user.name "${GITHUB_ACTOR}"
105105
106106
- name: Checkout source
107-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
107+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
108108
with:
109109
path: source
110110
persist-credentials: false
111111

112112
- name: Checkout target
113-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
113+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
114114
with:
115115
repository: codeigniter4/appstarter
116116
token: ${{ secrets.ACCESS_TOKEN }}
@@ -158,21 +158,21 @@ jobs:
158158
git config --global user.name "${GITHUB_ACTOR}"
159159
160160
- name: Checkout source
161-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
161+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
162162
with:
163163
path: source
164164
persist-credentials: false
165165

166166
- name: Checkout target
167-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
167+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
168168
with:
169169
repository: codeigniter4/userguide
170170
token: ${{ secrets.ACCESS_TOKEN }}
171171
path: userguide
172172
persist-credentials: false
173173

174174
- name: Setup Python
175-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
175+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
176176
with:
177177
python-version: '3.12'
178178

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ jobs:
2525
runs-on: ubuntu-24.04
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2929
with:
3030
persist-credentials: false
3131

3232
- name: Setup PHP
33-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
33+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
3434
with:
3535
php-version: '8.2'
3636
coverage: none
3737

3838
- name: Setup Python
39-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
39+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
4040
with:
4141
python-version: '3.12'
4242

‎.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-24.04
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2121

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

‎.github/workflows/label-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
18+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1919
with:
2020
persist-credentials: false
2121

‎.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-24.04
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
22+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2323

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

‎.github/workflows/reusable-coveralls.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2121
with:
2222
persist-credentials: false
2323

2424
- name: Setup PHP
25-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
25+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
2626
with:
2727
php-version: ${{ inputs.php-version }}
2828
tools: composer
@@ -43,7 +43,7 @@ jobs:
4343
echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
4444
4545
- name: Cache dependencies
46-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
46+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4747
with:
4848
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
4949
key: ${{ github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -52,7 +52,7 @@ jobs:
5252
${{ github.job }}-
5353
5454
- name: Cache PHPUnit's static analysis cache
55-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
55+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
5656
with:
5757
path: build/.phpunit.cache/code-coverage
5858
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,12 @@ jobs:
170170
sudo apt-get install -y imagemagick libmagickwand-dev ghostscript poppler-data libjbig2dec0:amd64 libopenjp2-7:amd64
171171
172172
- name: Checkout
173-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
173+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
174174
with:
175175
persist-credentials: false
176176

177177
- name: Setup PHP
178-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
178+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
179179
with:
180180
php-version: ${{ inputs.php-version }}
181181
tools: composer
@@ -192,7 +192,7 @@ jobs:
192192
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}${{ inputs.mysql-version || '' }}" >> $GITHUB_OUTPUT
193193
194194
- name: Cache dependencies
195-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
195+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
196196
with:
197197
path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
198198
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-${{ hashFiles('**/composer.*') }}
@@ -203,7 +203,7 @@ jobs:
203203
204204
- name: Cache PHPUnit's static analysis cache
205205
if: ${{ inputs.enable-artifact-upload }}
206-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
206+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
207207
with:
208208
path: build/.phpunit.cache/code-coverage
209209
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666
sudo apt-get install -y imagemagick libmagickwand-dev ghostscript poppler-data libjbig2dec0:amd64 libopenjp2-7:amd64
6767
6868
- name: Checkout
69-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
69+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7070
with:
7171
persist-credentials: false
7272
fetch-depth: 0
7373

7474
- name: Setup PHP
75-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
75+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
7676
with:
7777
php-version: ${{ inputs.php-version }}
7878
tools: composer
@@ -89,7 +89,7 @@ jobs:
8989
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}" >> $GITHUB_OUTPUT
9090
9191
- name: Cache Composer dependencies
92-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
92+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
9393
with:
9494
path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
9595
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -99,7 +99,7 @@ jobs:
9999
100100
- name: Cache PHPUnit's static analysis cache
101101
if: ${{ inputs.enable-artifact-upload }}
102-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
102+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
103103
with:
104104
path: build/.phpunit.cache/code-coverage
105105
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}

0 commit comments

Comments
 (0)