Skip to content

Commit 10067eb

Browse files
authored
Merge pull request #4701 from codeigniter4/develop
4.1.2 Ready code
2 parents 5e852b3 + fe31333 commit 10067eb

File tree

532 files changed

+18743
-8861
lines changed

Some content is hidden

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

532 files changed

+18743
-8861
lines changed

.github/workflows/deploy-framework.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: ./source/.github/scripts/deploy-framework ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/framework ${GITHUB_REF##*/}
3737

3838
- name: Release
39-
uses: actions/github-script@v3
39+
uses: actions/github-script@v4.0.2
4040
with:
4141
github-token: ${{secrets.ACCESS_TOKEN}}
4242
script: |
@@ -81,7 +81,7 @@ jobs:
8181
run: ./source/.github/scripts/deploy-appstarter ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/appstarter ${GITHUB_REF##*/}
8282

8383
- name: Release
84-
uses: actions/github-script@v3
84+
uses: actions/github-script@v4.0.2
8585
with:
8686
github-token: ${{secrets.ACCESS_TOKEN}}
8787
script: |

.github/workflows/test-phpstan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
build:
2727
name: PHP ${{ matrix.php-versions }} Static Analysis
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-20.04
2929
strategy:
3030
fail-fast: false
3131
matrix:
@@ -54,7 +54,7 @@ jobs:
5454
run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
5555

5656
- name: Cache composer dependencies
57-
uses: actions/cache@v2
57+
uses: actions/cache@v2.1.5
5858
with:
5959
path: ${{ steps.composer-cache.outputs.dir }}
6060
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -64,7 +64,7 @@ jobs:
6464
run: mkdir -p build/phpstan
6565

6666
- name: Cache PHPStan result cache directory
67-
uses: actions/cache@v2
67+
uses: actions/cache@v2.1.5
6868
with:
6969
path: build/phpstan
7070
key: ${{ runner.os }}-phpstan-${{ github.sha }}

.github/workflows/test-phpunit.yml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- spark
1515
- phpunit.xml.dist
1616
- '**.php'
17-
- phpunit.xml.dist
1817
- .github/workflows/test-phpunit.yml
1918
pull_request:
2019
branches:
@@ -29,13 +28,12 @@ on:
2928
- spark
3029
- phpunit.xml.dist
3130
- '**.php'
32-
- phpunit.xml.dist
3331
- .github/workflows/test-phpunit.yml
3432

3533
jobs:
3634

3735
tests:
38-
runs-on: ubuntu-latest
36+
runs-on: ubuntu-20.04
3937
if: "!contains(github.event.head_commit.message, '[ci skip]')"
4038
name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }}
4139

@@ -64,23 +62,28 @@ jobs:
6462
- 5432:5432
6563
options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3
6664
mssql:
67-
image: microsoft/mssql-server-linux:2017-latest
65+
image: mcr.microsoft.com/mssql/server:2019-CU10-ubuntu-20.04
6866
env:
6967
SA_PASSWORD: 1Secure*Password1
7068
ACCEPT_EULA: Y
7169
MSSQL_PID: Developer
7270
ports:
7371
- 1433:1433
72+
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
7473
redis:
7574
image: redis
7675
ports:
7776
- 6379:6379
7877
options: --health-cmd "redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
78+
memcached:
79+
image: memcached:1.6-alpine
80+
ports:
81+
- 11211:11211
7982

8083
steps:
8184
- name: Create database for MSSQL Server
82-
if: ${{ matrix.db-platforms == 'SQLSRV'}}
83-
run: sqlcmd -S localhost -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test"
85+
if: matrix.db-platforms == 'SQLSRV'
86+
run: sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test"
8487

8588
- name: Checkout
8689
uses: actions/checkout@v2
@@ -90,20 +93,23 @@ jobs:
9093
with:
9194
php-version: ${{ matrix.php-versions }}
9295
tools: composer, pecl
93-
extensions: imagick, sqlsrv-beta
96+
extensions: imagick, sqlsrv, gd, sqlite3, redis, memcached, pgsql
9497
coverage: xdebug
9598
env:
9699
update: true
97100

98-
- name: Install Memcached
99-
uses: niden/actions-memcached@v7
101+
- name: Install latest ImageMagick
102+
run: |
103+
sudo apt-get remove ghostscript
104+
sudo apt-get update
105+
sudo apt-get install -y imagemagick ghostscript-x gsfonts
100106
101107
- name: Get composer cache directory
102108
id: composercache
103109
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
104110

105111
- name: Cache dependencies
106-
uses: actions/cache@v2
112+
uses: actions/cache@v2.1.5
107113
with:
108114
path: ${{ steps.composercache.outputs.dir }}
109115
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -112,13 +118,17 @@ jobs:
112118
- name: Install dependencies
113119
run: |
114120
composer update --ansi --no-interaction
115-
composer remove --ansi --dev --unused rector/rector phpstan/phpstan codeigniter4/codeigniter4-standard squizlabs/php_codesniffer
121+
composer remove --ansi --dev --unused -W rector/rector phpstan/phpstan codeigniter4/codeigniter4-standard squizlabs/php_codesniffer
116122
php -r 'file_put_contents("vendor/laminas/laminas-zendframework-bridge/src/autoload.php", "");'
117123
env:
118124
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
119125

126+
- name: Profile slow tests in PHP 7.4 MySQLi for now
127+
if: matrix.php-versions == '7.4' && matrix.db-platforms == 'MySQLi'
128+
run: echo "TACHYCARDIA_MONITOR_GA=enabled" >> $GITHUB_ENV
129+
120130
- name: Test with PHPUnit
121-
run: script -e -c "vendor/bin/phpunit -v"
131+
run: script -e -c "vendor/bin/phpunit --color=always"
122132
env:
123133
DB: ${{ matrix.db-platforms }}
124134
TERM: xterm-256color
@@ -135,7 +145,7 @@ jobs:
135145

136146
coveralls-finish:
137147
needs: [tests]
138-
runs-on: ubuntu-latest
148+
runs-on: ubuntu-20.04
139149
steps:
140150
- name: Coveralls Finished
141151
uses: coverallsapp/github-action@master

.github/workflows/test-rector.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- 'system/**'
1313
- '.github/workflows/test-rector.yml'
1414
- composer.json
15+
- 'utils/Rector/**'
1516
- 'rector.php'
1617
push:
1718
branches:
@@ -22,20 +23,25 @@ on:
2223
- 'system/**'
2324
- '.github/workflows/test-rector.yml'
2425
- composer.json
26+
- 'utils/Rector/**'
2527
- 'rector.php'
2628

2729
jobs:
2830
build:
29-
name: Analyze code (Rector)
30-
runs-on: ubuntu-latest
31+
name: PHP ${{ matrix.php-versions }} Analyze code (Rector)
32+
runs-on: ubuntu-20.04
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
php-versions: ['7.4', '8.0']
3137
steps:
3238
- name: Checkout
3339
uses: actions/checkout@v2
3440

3541
- name: Setup PHP
3642
uses: shivammathur/setup-php@v2
3743
with:
38-
php-version: '7.4'
44+
php-version: ${{ matrix.php-versions }}
3945
extensions: intl
4046

4147
- name: Use latest Composer
@@ -52,7 +58,7 @@ jobs:
5258
run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
5359

5460
- name: Cache composer dependencies
55-
uses: actions/cache@v2
61+
uses: actions/cache@v2.1.5
5662
with:
5763
path: ${{ steps.composer-cache.outputs.dir }}
5864
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -62,4 +68,4 @@ jobs:
6268
run: composer update --ansi --no-interaction
6369

6470
- name: Run static analysis
65-
run: vendor/bin/rector process --dry-run
71+
run: vendor/bin/rector process --dry-run --no-progress-bar

.github/workflows/test-userguide.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
syntax_check:
1717
name: Check User Guide syntax
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-20.04
1919
steps:
2020
- uses: actions/checkout@v2
2121
- uses: ammaraskar/[email protected]

0 commit comments

Comments
 (0)