Skip to content

Commit 558db23

Browse files
authored
Merge pull request #7065 from codeigniter4/develop
4.2.12 Ready code
2 parents f04c67d + 96af785 commit 558db23

File tree

92 files changed

+702
-256
lines changed

Some content is hidden

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

92 files changed

+702
-256
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ body:
2525
description: Which PHP versions did you run your code?
2626
multiple: true
2727
options:
28-
- '7.3'
2928
- '7.4'
3029
- '8.0'
3130
- '8.1'
31+
- '8.2'
3232
validations:
3333
required: true
3434

.github/scripts/deploy-userguide

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ cd $TARGET
2323
git checkout master
2424
rm -rf docs
2525

26+
# Copy common files
27+
cp -Rf ${SOURCE}/LICENSE ./
28+
29+
# Copy repo-specific files
30+
cp -Rf ${SOURCE}/admin/userguide/. ./
31+
2632
# Copy files
2733
cp -Rf ${SOURCE}/user_guide_src/build/html ./docs
2834
cp -Rf ${SOURCE}/user_guide_src/build/epub/CodeIgniter.epub ./CodeIgniter${VERSION}.epub

.github/workflows/deploy-apidocs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,14 @@ on:
1111
- 'system/**'
1212
- '.github/workflows/deploy-apidocs.yml'
1313

14+
permissions:
15+
contents: read
16+
1417
jobs:
1518
build:
1619
name: Deploy to api
20+
permissions:
21+
contents: write
1722
if: github.repository == 'codeigniter4/CodeIgniter4'
1823
runs-on: ubuntu-22.04
1924

.github/workflows/deploy-distributables.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
release:
77
types: [published]
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
check-version:
1114
name: Check for updated version
@@ -31,6 +34,9 @@ jobs:
3134
3235
framework:
3336
name: Deploy to framework
37+
permissions:
38+
# Allow actions/github-script to create release
39+
contents: write
3440
if: github.repository == 'codeigniter4/CodeIgniter4'
3541
runs-on: ubuntu-22.04
3642
needs: check-version
@@ -78,6 +84,9 @@ jobs:
7884
7985
appstarter:
8086
name: Deploy to appstarter
87+
permissions:
88+
# Allow actions/github-script to create release
89+
contents: write
8190
if: github.repository == 'codeigniter4/CodeIgniter4'
8291
runs-on: ubuntu-22.04
8392
needs: check-version
@@ -125,6 +134,9 @@ jobs:
125134
126135
userguide:
127136
name: Deploy to userguide
137+
permissions:
138+
# Allow actions/github-script to create release
139+
contents: write
128140
if: github.repository == 'codeigniter4/CodeIgniter4'
129141
runs-on: ubuntu-22.04
130142
needs: check-version

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,15 @@ on:
1212
paths:
1313
- 'user_guide_src/**'
1414

15+
permissions:
16+
contents: read
17+
1518
jobs:
1619
build:
1720
name: Deploy to gh-pages
21+
permissions:
22+
# Allow ad-m/github-push-action to push commit to branch gh-pages
23+
contents: write
1824
if: (github.repository == 'codeigniter4/CodeIgniter4')
1925
runs-on: ubuntu-latest
2026
steps:

.github/workflows/test-autoreview.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ concurrency:
1818
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1919
cancel-in-progress: true
2020

21+
permissions:
22+
contents: read
23+
2124
jobs:
2225
auto-review-tests:
2326
uses: ./.github/workflows/reusable-serviceless-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo

.github/workflows/test-coding-standards.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ concurrency:
1616
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1717
cancel-in-progress: true
1818

19+
permissions:
20+
contents: read
21+
1922
jobs:
2023
lint:
2124
name: PHP ${{ matrix.php-version }} Lint with PHP CS Fixer

.github/workflows/test-deptrac.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ concurrency:
2828
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
2929
cancel-in-progress: true
3030

31+
permissions:
32+
contents: read
33+
3134
jobs:
3235
build:
3336
name: Architectural Inspection
@@ -73,3 +76,5 @@ jobs:
7376
run: |
7477
sudo phive --no-progress install --global qossmic/deptrac --trust-gpg-keys B8F640134AB1782E
7578
deptrac analyze --cache-file=build/deptrac.cache
79+
env:
80+
GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test-phpcpd.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ concurrency:
2727
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
2828
cancel-in-progress: true
2929

30+
permissions:
31+
contents: read
32+
3033
jobs:
3134
build:
3235
name: Duplicate Code Detection

.github/workflows/test-phpstan.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ concurrency:
3131
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
3232
cancel-in-progress: true
3333

34+
permissions:
35+
contents: read
36+
3437
jobs:
3538
build:
3639
name: PHP ${{ matrix.php-versions }} Static Analysis

0 commit comments

Comments
 (0)