Skip to content

Commit 5e4ebad

Browse files
kenjiskenjis
authored
Merge pull request #887 from codeigniter4/develop
1.0.0-beta.7 Ready code
2 parents b5fbc78 + 5f81a95 commit 5e4ebad

File tree

160 files changed

+6938
-2496
lines changed

Some content is hidden

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

160 files changed

+6938
-2496
lines changed

‎.github/workflows/deptrac.yml‎

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -19,54 +19,5 @@ on:
1919
- '.github/workflows/deptrac.yml'
2020

2121
jobs:
22-
build:
23-
name: Dependency Tracing
24-
runs-on: ubuntu-latest
25-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
26-
27-
steps:
28-
- name: Checkout
29-
uses: actions/checkout@v3
30-
31-
- name: Set up PHP
32-
uses: shivammathur/setup-php@v2
33-
with:
34-
php-version: '8.1'
35-
tools: phive
36-
extensions: intl, json, mbstring, xml
37-
coverage: none
38-
env:
39-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40-
41-
- name: Get composer cache directory
42-
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
43-
44-
- name: Cache composer dependencies
45-
uses: actions/cache@v3
46-
with:
47-
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
48-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
49-
restore-keys: ${{ runner.os }}-composer-
50-
51-
- name: Create Deptrac cache directory
52-
run: mkdir -p build/
53-
54-
- name: Cache Deptrac results
55-
uses: actions/cache@v3
56-
with:
57-
path: build
58-
key: ${{ runner.os }}-deptrac-${{ github.sha }}
59-
restore-keys: ${{ runner.os }}-deptrac-
60-
61-
- name: Install dependencies
62-
run: |
63-
if [ -f composer.lock ]; then
64-
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
65-
else
66-
composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
67-
fi
68-
69-
- name: Trace dependencies
70-
run: |
71-
sudo phive --no-progress install --global --trust-gpg-keys B8F640134AB1782E,A98E898BB53EB748 qossmic/deptrac
72-
deptrac analyze --cache-file=build/deptrac.cache
22+
deptrac:
23+
uses: codeigniter4/.github/.github/workflows/deptrac.yml@main

‎.github/workflows/docs.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ jobs:
99
deploy:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- uses: actions/setup-python@v4
1414
with:
1515
python-version: 3.x
16-
- run: pip install mkdocs-material
16+
- run: pip3 install mkdocs-material
17+
- run: pip3 install mkdocs-git-revision-date-localized-plugin
18+
- run: pip3 install mkdocs-redirects
1719
- run: mkdocs gh-deploy --force

‎.github/workflows/no-merge-commits.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Detect Merge Commits
2+
3+
on:
4+
pull_request:
5+
6+
permissions:
7+
contents: read
8+
pull-requests: read
9+
10+
jobs:
11+
test:
12+
name: Check for merge commits
13+
runs-on: ubuntu-22.04
14+
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
19+
- name: Run test
20+
uses: NexusPHP/[email protected]
21+
with:
22+
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/phpcpd.yml‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,8 @@ on:
1515
- '.github/workflows/phpcpd.yml'
1616

1717
jobs:
18-
build:
19-
name: Code Copy-Paste Detection
20-
runs-on: ubuntu-latest
21-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
22-
23-
steps:
24-
- name: Checkout
25-
uses: actions/checkout@v3
26-
27-
- name: Setup PHP
28-
uses: shivammathur/setup-php@v2
29-
with:
30-
php-version: '8.0'
31-
tools: phpcpd
32-
extensions: dom, mbstring
33-
coverage: none
34-
35-
- name: Detect duplicate code
36-
run: phpcpd src/ tests/ --exclude src/Database/Migrations/2020-12-28-223112_create_auth_tables.php
18+
phpcpd:
19+
uses: codeigniter4/.github/.github/workflows/phpcpd.yml@main
20+
with:
21+
dirs: "src/ tests/"
22+
options: "--exclude src/Database/Migrations/2020-12-28-223112_create_auth_tables.php --exclude src/Authentication/Authenticators/HmacSha256.php --exclude tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php"

‎.github/workflows/phpcsfixer.yml‎

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,45 +15,5 @@ on:
1515
- '.github/workflows/phpcsfixer.yml'
1616

1717
jobs:
18-
build:
19-
name: PHP ${{ matrix.php-versions }} Coding Standards
20-
runs-on: ubuntu-latest
21-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
22-
strategy:
23-
fail-fast: false
24-
matrix:
25-
php-versions: ['7.4', '8.0', '8.1']
26-
27-
steps:
28-
- name: Checkout
29-
uses: actions/checkout@v3
30-
31-
- name: Set up PHP
32-
uses: shivammathur/setup-php@v2
33-
with:
34-
php-version: ${{ matrix.php-versions }}
35-
extensions: json, tokenizer
36-
coverage: none
37-
env:
38-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39-
40-
- name: Get composer cache directory
41-
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
42-
43-
- name: Cache composer dependencies
44-
uses: actions/cache@v3
45-
with:
46-
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
47-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
48-
restore-keys: ${{ runner.os }}-composer-
49-
50-
- name: Install dependencies
51-
run: |
52-
if [ -f composer.lock ]; then
53-
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
54-
else
55-
composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
56-
fi
57-
58-
- name: Check code for standards compliance
59-
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff
18+
phpcsfixer:
19+
uses: codeigniter4/.github/.github/workflows/phpcsfixer.yml@main

‎.github/workflows/phpstan.yml‎

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -19,56 +19,5 @@ on:
1919
- '.github/workflows/phpstan.yml'
2020

2121
jobs:
22-
build:
23-
name: PHP ${{ matrix.php-versions }} Static Analysis
24-
runs-on: ubuntu-latest
25-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
26-
strategy:
27-
fail-fast: false
28-
matrix:
29-
php-versions: ['7.4', '8.0', '8.1']
30-
31-
steps:
32-
- name: Checkout
33-
uses: actions/checkout@v3
34-
35-
- name: Setup PHP
36-
uses: shivammathur/setup-php@v2
37-
with:
38-
php-version: ${{ matrix.php-versions }}
39-
tools: phpstan, phpunit
40-
extensions: intl, json, mbstring, xml
41-
coverage: none
42-
env:
43-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
45-
- name: Get composer cache directory
46-
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
47-
48-
- name: Cache composer dependencies
49-
uses: actions/cache@v3
50-
with:
51-
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
52-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
53-
restore-keys: ${{ runner.os }}-composer-
54-
55-
- name: Create PHPStan cache directory
56-
run: mkdir -p build/phpstan
57-
58-
- name: Cache PHPStan results
59-
uses: actions/cache@v3
60-
with:
61-
path: build/phpstan
62-
key: ${{ runner.os }}-phpstan-${{ github.sha }}
63-
restore-keys: ${{ runner.os }}-phpstan-
64-
65-
- name: Install dependencies
66-
run: |
67-
if [ -f composer.lock ]; then
68-
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
69-
else
70-
composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
71-
fi
72-
73-
- name: Run static analysis
74-
run: vendor/bin/phpstan analyze
22+
phpstan:
23+
uses: codeigniter4/.github/.github/workflows/phpstan.yml@main

‎.github/workflows/phpunit-lang.yml‎

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

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030

3131
- name: Set up PHP
3232
uses: shivammathur/setup-php@v2

‎.github/workflows/phpunit-lowest.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: PHPUnit Lowest
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- develop
7+
paths:
8+
- '**.php'
9+
- 'composer.*'
10+
- 'phpunit*'
11+
- '.github/workflows/phpunit-lowest.yml'
12+
push:
13+
branches:
14+
- develop
15+
paths:
16+
- '**.php'
17+
- 'composer.*'
18+
- 'phpunit*'
19+
- '.github/workflows/phpunit-lowest.yml'
20+
21+
jobs:
22+
phpunit:
23+
uses: codeigniter4/.github/.github/workflows/phpunit-lowest.yml@main

0 commit comments

Comments
 (0)