Skip to content

Commit 925b9f8

Browse files
Merge pull request #67 from TheDragonCode/3.x
Added Laravel 10 support
2 parents 70f668a + fac38df commit 925b9f8

10 files changed

+101
-231
lines changed

Diff for: .github/workflows/code-style.yml

+35
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

Diff for: .github/workflows/laravel-6.yml

-31
This file was deleted.

Diff for: .github/workflows/laravel-7.yml

-31
This file was deleted.

Diff for: .github/workflows/laravel-8.yml

-31
This file was deleted.

Diff for: .github/workflows/laravel-9.yml

-31
This file was deleted.

Diff for: .github/workflows/lint-check.yml

-14
This file was deleted.

Diff for: .github/workflows/lint-fixer.yml

-19
This file was deleted.

Diff for: .github/workflows/phpunit.yml

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: phpunit
2+
3+
on: [ push ]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
strategy:
10+
fail-fast: true
11+
matrix:
12+
php: [ "7.3", "7.4", "8.0", "8.1", "8.2" ]
13+
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0" ]
14+
exclude:
15+
- laravel: "6.0"
16+
php: "8.1"
17+
18+
- laravel: "6.0"
19+
php: "8.2"
20+
21+
- laravel: "7.0"
22+
php: "8.1"
23+
24+
- laravel: "7.0"
25+
php: "8.2"
26+
27+
- laravel: "9.0"
28+
php: "7.3"
29+
30+
- laravel: "9.0"
31+
php: "7.4"
32+
33+
- laravel: "10.0"
34+
php: "7.3"
35+
36+
- laravel: "10.0"
37+
php: "7.4"
38+
39+
- laravel: "10.0"
40+
php: "8.0"
41+
42+
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
43+
44+
steps:
45+
- name: Checkout code
46+
uses: actions/checkout@v3
47+
48+
- name: Setup PHP
49+
uses: shivammathur/setup-php@v2
50+
with:
51+
php-version: ${{ matrix.php }}
52+
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
53+
coverage: none
54+
55+
- name: Install dependencies
56+
run: composer require --dev laravel/framework:^${{ matrix.laravel }}
57+
58+
- name: Execute tests
59+
run: sudo vendor/bin/phpunit

Diff for: .styleci.yml

-67
This file was deleted.

Diff for: composer.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252
"dragon-code/laravel-routes-core": "^4.1 || ^5.0",
5353
"dragon-code/laravel-support": "^3.3",
5454
"dragon-code/support": "^5.6 || ^6.1",
55-
"illuminate/contracts": "^6.0 || ^7.0 || ^8.0 || ^9.0",
56-
"illuminate/http": "^6.0 || ^7.0 || ^8.0 || ^9.0",
57-
"illuminate/routing": "^6.0 || ^7.0 || ^8.0 || ^9.0",
58-
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
59-
"illuminate/view": "^6.0 || ^7.0 || ^8.0 || ^9.0"
55+
"illuminate/contracts": ">=6.0 <11.0",
56+
"illuminate/http": ">=6.0 <11.0",
57+
"illuminate/routing": ">=6.0 <11.0",
58+
"illuminate/support": ">=6.0 <11.0",
59+
"illuminate/view": ">=6.0 <11.0"
6060
},
6161
"require-dev": {
6262
"mockery/mockery": "^1.0",
63-
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
64-
"phpunit/phpunit": "^8.0 || ^9.0"
63+
"orchestra/testbench": ">=4.0 <9.0",
64+
"phpunit/phpunit": "^8.0 || ^9.6"
6565
},
6666
"conflict": {
6767
"garygreen/pretty-routes": "*"

0 commit comments

Comments
 (0)