Skip to content

Commit 7280902

Browse files
authored
Merge pull request #403 from Astrotomic/laravel-11
Laravel 11
2 parents 1e8c46d + 88baff3 commit 7280902

37 files changed

+630
-650
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
/.gitattributes export-ignore
66
/.gitignore export-ignore
77
/.gitbook.yaml export-ignore
8-
/.php_cs export-ignore
98
/.styleci.yml export-ignore
109
/.phpunit.xml.dist export-ignore
10+
/pint.json export-ignore

.github/workflows/composer-normalize.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Git checkout
14-
uses: actions/checkout@v4.1.2
14+
uses: actions/checkout@v4
1515

1616
- name: Validate Composer configuration
1717
run: composer validate --strict
@@ -22,6 +22,6 @@ jobs:
2222
composer global config --no-plugins allow-plugins.ergebnis/composer-normalize true
2323
composer normalize --indent-style=space --indent-size=4 --no-check-lock --no-update-lock --no-interaction --ansi
2424
25-
- uses: stefanzweifel/git-auto-commit-action@v4.15.4
25+
- uses: stefanzweifel/git-auto-commit-action@v5
2626
with:
2727
commit_message: normalize composer.json

.github/workflows/dependabot-auto-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v1.6.0
16+
uses: dependabot/fetch-metadata@v2
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919
compat-lookup: true
@@ -37,4 +37,4 @@ jobs:
3737
run: gh pr merge --auto --merge "$PR_URL"
3838
env:
3939
PR_URL: ${{github.event.pull_request.html_url}}
40-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
40+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/markdown-normalize.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Git checkout
14-
uses: actions/checkout@v4.1.2
14+
uses: actions/checkout@v4
1515

1616
- name: Prettify markdown
17-
uses: creyD/prettier_action@v4.3
17+
uses: creyD/prettier_action@v4
1818
with:
1919
prettier_options: --write **/*.md

.github/workflows/run-tests.yml renamed to .github/workflows/phpunit.yml

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,44 @@
1-
name: run-tests
1+
name: phpunit
22

33
on:
44
push:
55
pull_request:
6-
schedule:
7-
- cron: '0 0 * * *'
86

97
jobs:
108
test:
119
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
10+
1211
runs-on: ${{ matrix.os }}
1312

1413
strategy:
15-
fail-fast: true
14+
fail-fast: false
1615
matrix:
17-
php: [8.0, 8.1]
18-
laravel: [8.*, 9.*, 10.*]
16+
php: ['8.0', '8.1', '8.2', '8.3']
17+
laravel: ['9.*', '10.*', '11.*']
1918
dependency-version: [prefer-stable]
2019
os: [ubuntu-latest]
20+
include:
21+
- laravel: '9.*'
22+
phpunit: '9.*'
23+
- laravel: '10.*'
24+
phpunit: '10.*'
25+
- laravel: '11.*'
26+
phpunit: '10.*'
2127
exclude:
22-
- laravel: 10.*
23-
php: 8.0
28+
- php: '8.0'
29+
laravel: '10.*'
30+
- php: '8.0'
31+
laravel: '11.*'
32+
- php: '8.3'
33+
laravel: '9.*'
34+
- php: '8.1'
35+
laravel: '11.*'
2436

2537
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
2638

2739
steps:
2840
- name: Checkout code
29-
uses: actions/[email protected]
30-
31-
- name: Cache dependencies
32-
uses: actions/cache@v4
33-
with:
34-
path: ~/.composer/cache/files
35-
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
36-
restore-keys: |
37-
dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-
38-
dependencies-laravel-${{ matrix.laravel }}-php-
39-
dependencies-laravel-
41+
uses: actions/checkout@v4
4042

4143
- name: Setup PHP
4244
uses: shivammathur/setup-php@v2
@@ -49,6 +51,7 @@ jobs:
4951
- name: Install dependencies
5052
run: |
5153
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
54+
composer require "phpunit/phpunit:${{ matrix.phpunit }}" --dev --no-interaction --no-update
5255
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
5356
5457
- name: Execute tests

.github/workflows/pint.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: pint
2+
3+
on:
4+
push:
5+
6+
jobs:
7+
pint:
8+
runs-on: ubuntu-latest
9+
timeout-minutes: 5
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: shivammathur/setup-php@v2
13+
with:
14+
php-version: 8.3
15+
- run: composer install --prefer-dist --no-interaction --no-suggest
16+
- run: vendor/bin/pint --test

.github/workflows/stale-issues.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/vendor/
22
/composer.lock
33
/coverage/
4-
/.phpunit.result.cache
4+
/.phpunit.cache
55
/build/
66
/coverage.clover

.php_cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

.styleci.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)