Skip to content

Commit 0cc68c1

Browse files
Merge pull request #13 from TheDragonCode/1.x
Added Laravel 10 support
2 parents 9fe6dc5 + 1631cbf commit 0cc68c1

File tree

6 files changed

+52
-78
lines changed

6 files changed

+52
-78
lines changed

.github/workflows/code-style.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: code-style
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
permissions: write-all
8+
9+
jobs:
10+
check:
11+
if: ${{ ! (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout code
17+
uses: actions/checkout@v3
18+
19+
- name: Checking PHP Syntax
20+
uses: TheDragonCode/[email protected]
21+
22+
fix:
23+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
24+
25+
runs-on: ubuntu-latest
26+
27+
steps:
28+
- name: Checkout code
29+
uses: actions/checkout@v3
30+
31+
- name: Checking PHP Syntax
32+
uses: TheDragonCode/[email protected]
33+
with:
34+
github_token: ${{ secrets.COMPOSER_TOKEN }}
35+
fix: true

.github/workflows/laravel-9.yml

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

.github/workflows/lint-check.yml

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

.github/workflows/lint-fixer.yml

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

.github/workflows/laravel-8.yml renamed to .github/workflows/phpunit.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Laravel 8"
1+
name: phpunit
22

33
on: [ push ]
44

@@ -9,10 +9,14 @@ jobs:
99
strategy:
1010
fail-fast: true
1111
matrix:
12-
php: [ "8.0", "8.1" ]
13-
laravel: [ "8.0" ]
12+
php: [ "8.0", "8.1", "8.2" ]
13+
laravel: [ "8.0", "9.0", "10.0" ]
14+
dragon: [ "5.8", "6.0" ]
15+
exclude:
16+
- laravel: "10.0"
17+
php: "8.0"
1418

15-
name: PHP ${{ matrix.php }}
19+
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, Dragon ${{ matrix.dragon }}
1620

1721
steps:
1822
- name: Checkout code
@@ -26,7 +30,7 @@ jobs:
2630
coverage: none
2731

2832
- name: Install dependencies
29-
run: composer require --dev laravel/framework:^${{ matrix.laravel }}
33+
run: composer require --dev laravel/framework:^${{ matrix.laravel }} dragon-code/support:^${{ matrix.dragon }}
3034

3135
- name: Execute tests
32-
run: sudo vendor/bin/phpunit --colors=always
36+
run: sudo vendor/bin/phpunit

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848
"php": "^8.0",
4949
"doctrine/dbal": "^3.3",
5050
"dragon-code/support": "^5.8 || ^6.0",
51-
"illuminate/contracts": "^8.37 || ^9.0",
52-
"illuminate/database": "^8.37 || ^9.0",
53-
"illuminate/http": "^8.37 || ^9.0",
54-
"illuminate/routing": "^8.37 || ^9.0",
55-
"illuminate/support": "^8.37 || ^9.0"
51+
"illuminate/contracts": "^8.37 || ^9.0 || ^10.0",
52+
"illuminate/database": "^8.37 || ^9.0 || ^10.0",
53+
"illuminate/http": "^8.37 || ^9.0 || ^10.0",
54+
"illuminate/routing": "^8.37 || ^9.0 || ^10.0",
55+
"illuminate/support": "^8.37 || ^9.0 || ^10.0"
5656
},
5757
"require-dev": {
5858
"mockery/mockery": "^1.5",
59-
"orchestra/testbench": "^6.0 || ^7.0",
60-
"phpunit/phpunit": "^9.5"
59+
"orchestra/testbench": "^6.0 || ^7.0 || ^8.0",
60+
"phpunit/phpunit": "^9.6"
6161
},
6262
"minimum-stability": "stable",
6363
"prefer-stable": true,

0 commit comments

Comments
 (0)