Skip to content

Commit 6b2816c

Browse files
authored
Merge pull request #5530 from codeigniter4/develop
4.1.6 Ready code
2 parents 8c7f701 + ec98d58 commit 6b2816c

File tree

367 files changed

+7659
-4645
lines changed

Some content is hidden

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

367 files changed

+7659
-4645
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ body:
1313
whether still open or closed, related to your report**.
1414
If there is, your report will be closed promptly.
1515
16-
And if you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases) of CodeIgniter, please update.
16+
For example, if you get the error "*Undefined property: Config\\Exceptions::$sensitiveDataInTrace*",
17+
you can search the GitHub repository with the keyword "[$sensitiveDataInTrace](https://github.com/codeigniter4/CodeIgniter4/search?q=%24sensitiveDataInTrace&type=issues)".
1718
1819
---
1920
@@ -35,6 +36,23 @@ body:
3536
id: codeigniter-version
3637
attributes:
3738
label: CodeIgniter4 Version
39+
description: |
40+
e.g. 4.1.5
41+
If you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases), please
42+
check to see if the problem occurs with the latest version.
43+
validations:
44+
required: true
45+
46+
- type: dropdown
47+
id: codeigniter-installation
48+
attributes:
49+
label: CodeIgniter4 Installation Method
50+
multiple: false
51+
options:
52+
- Composer (using `codeigniter4/appstarter`)
53+
- Composer (as dependency to an existing project)
54+
- Manual (zip or tar.gz)
55+
- Git
3856
validations:
3957
required: true
4058

@@ -69,6 +87,7 @@ body:
6987
id: database
7088
attributes:
7189
label: Database
90+
description: e.g. MySQL 5.6, MariaDB 10.2, PostgreSQL 9.6
7291
validations:
7392
required: false
7493

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: CodeIgniter Forum
4-
url: https://forum.codeigniter.com
4+
url: https://forum.codeigniter.com/forum-30.html
55
about: Please ask your support questions in the forums. Thanks!
66

77
- name: CodeIgniter Slack channel

.github/release.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
changelog:
2+
exclude:
3+
authors:
4+
- dependabot
5+
categories:
6+
- title: Breaking Changes
7+
labels:
8+
- 'breaking change'
9+
- title: Fixed Bugs
10+
labels:
11+
- bug
12+
- title: New Features
13+
labels:
14+
- 'new feature'
15+
- title: Enhancements
16+
labels:
17+
- enhancement
18+
- title: Refactoring
19+
labels:
20+
- refactor
21+
- title: Others (Only for checking. Remove this category)
22+
labels:
23+
- "*"

.github/scripts/deploy-framework

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ done
2828

2929
# Copy repo-specific files
3030
cp -Rf ${SOURCE}/admin/framework/. ./
31+
# Copy tests files
32+
cp -Rf ${SOURCE}/admin/starter/tests/. ./tests/
3133

3234
# Commit the changes
3335
git add .

.github/workflows/deploy-framework.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
with:
4141
github-token: ${{secrets.ACCESS_TOKEN}}
4242
script: |
43-
const release = await github.repos.getLatestRelease({
43+
const release = await github.rest.repos.getLatestRelease({
4444
owner: context.repo.owner,
4545
repo: context.repo.repo
4646
})
47-
github.repos.createRelease({
47+
github.rest.repos.createRelease({
4848
owner: context.repo.owner,
4949
repo: 'framework',
5050
tag_name: release.data.tag_name,
@@ -85,11 +85,11 @@ jobs:
8585
with:
8686
github-token: ${{secrets.ACCESS_TOKEN}}
8787
script: |
88-
const release = await github.repos.getLatestRelease({
88+
const release = await github.rest.repos.getLatestRelease({
8989
owner: context.repo.owner,
9090
repo: context.repo.repo
9191
})
92-
github.repos.createRelease({
92+
github.rest.repos.createRelease({
9393
owner: context.repo.owner,
9494
repo: 'appstarter',
9595
tag_name: release.data.tag_name,

.github/workflows/test-phpstan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
php-versions: ['7.4', '8.0']
32+
php-versions: ['8.0', '8.1']
3333
steps:
3434
- name: Checkout
3535
uses: actions/checkout@v2

.github/workflows/test-phpunit.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@ on:
44
push:
55
branches:
66
- develop
7-
- '4.*'
87
paths:
9-
- 'app/**'
10-
- 'public/**'
11-
- 'system/**'
12-
- 'tests/**'
138
- composer.json
149
- spark
1510
- phpunit.xml.dist
@@ -18,35 +13,32 @@ on:
1813
pull_request:
1914
branches:
2015
- develop
21-
- '4.*'
2216
paths:
23-
- 'app/**'
24-
- 'public/**'
25-
- 'system/**'
26-
- 'tests/**'
2717
- composer.json
2818
- spark
2919
- phpunit.xml.dist
3020
- '**.php'
3121
- .github/workflows/test-phpunit.yml
3222

3323
jobs:
34-
3524
tests:
25+
name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }}
3626
runs-on: ubuntu-20.04
3727
if: "!contains(github.event.head_commit.message, '[ci skip]')"
38-
name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }}
3928

4029
strategy:
4130
fail-fast: false
4231
matrix:
43-
php-versions: ['7.3', '7.4', '8.0']
32+
php-versions: ['7.3', '7.4', '8.0', '8.1']
4433
db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
4534
mysql-versions: ['5.7']
4635
include:
4736
- php-versions: '7.4'
4837
db-platforms: MySQLi
4938
mysql-versions: '8.0'
39+
# @todo remove once 8.1 is stable enough
40+
- php-versions: '8.1'
41+
composer-flag: '--ignore-platform-req=php'
5042

5143
services:
5244
mysql:
@@ -57,6 +49,7 @@ jobs:
5749
ports:
5850
- 3306:3306
5951
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
52+
6053
postgres:
6154
image: postgres
6255
env:
@@ -66,6 +59,7 @@ jobs:
6659
ports:
6760
- 5432:5432
6861
options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3
62+
6963
mssql:
7064
image: mcr.microsoft.com/mssql/server:2019-CU10-ubuntu-20.04
7165
env:
@@ -75,11 +69,13 @@ jobs:
7569
ports:
7670
- 1433:1433
7771
options: --health-cmd="/opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q 'SELECT @@VERSION'" --health-interval=10s --health-timeout=5s --health-retries=3
72+
7873
redis:
7974
image: redis
8075
ports:
8176
- 6379:6379
8277
options: --health-cmd "redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
78+
8379
memcached:
8480
image: memcached:1.6-alpine
8581
ports:
@@ -105,6 +101,7 @@ jobs:
105101

106102
- name: Install latest ImageMagick
107103
run: |
104+
sudo apt-get update
108105
sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 gsfonts libopenjp2-7:amd64 fonts-droid-fallback ttf-dejavu-core
109106
sudo apt-get install -y imagemagick
110107
sudo apt-get install --fix-broken
@@ -122,13 +119,13 @@ jobs:
122119

123120
- name: Install dependencies
124121
run: |
125-
composer update --ansi --no-interaction
126-
composer remove --ansi --dev --unused -W rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
122+
composer update --ansi --no-interaction ${{ matrix.composer-flag }}
123+
composer remove --ansi --dev --unused -W ${{ matrix.composer-flag }} -- rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
127124
env:
128125
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
129126

130-
- name: Profile slow tests in PHP 7.4 MySQLi for now
131-
if: matrix.php-versions == '7.4' && matrix.db-platforms == 'MySQLi'
127+
- name: Profile slow tests in PHP 8.0
128+
if: matrix.php-versions == '8.0'
132129
run: echo "TACHYCARDIA_MONITOR_GA=enabled" >> $GITHUB_ENV
133130

134131
- name: Test with PHPUnit
@@ -137,10 +134,10 @@ jobs:
137134
DB: ${{ matrix.db-platforms }}
138135
TERM: xterm-256color
139136

140-
- if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '7.4'
141-
name: Run Coveralls
137+
- name: Run Coveralls
138+
if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '8.0'
142139
run: |
143-
composer global require --ansi php-coveralls/php-coveralls:^2.4
140+
composer global require --ansi php-coveralls/php-coveralls:^2.4 symfony/console:^5
144141
php-coveralls --coverage_clover=build/logs/clover.xml -v
145142
env:
146143
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -151,6 +148,7 @@ jobs:
151148
if: github.repository_owner == 'codeigniter4'
152149
needs: [tests]
153150
runs-on: ubuntu-20.04
151+
154152
steps:
155153
- name: Coveralls Finished
156154
uses: coverallsapp/github-action@master

0 commit comments

Comments
 (0)