Skip to content

Commit b23b4e9

Browse files
Merge pull request #27 from TheDragonCode/5.x
Added Laravel 10 support
2 parents 7124caf + fe1c9cd commit b23b4e9

File tree

8 files changed

+59
-173
lines changed

8 files changed

+59
-173
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-8.yml

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

.github/workflows/laravel-9.yml

Lines changed: 0 additions & 31 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.
Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
1-
name: "Laravel 7"
1+
name: phpunit
2+
23
on: [ push ]
34

45
jobs:
5-
phpunit:
6+
build:
67
runs-on: ubuntu-latest
78

89
strategy:
910
fail-fast: true
1011
matrix:
11-
php: [ "8.0" ]
12-
laravel: [ "7.0" ]
12+
php: [ "8.0", "8.1", "8.2" ]
13+
laravel: [ "7.0", "8.0", "9.0", "10.0" ]
14+
exclude:
15+
- laravel: "7.0"
16+
php: "8.1"
17+
18+
- laravel: "7.0"
19+
php: "8.2"
20+
21+
- laravel: "10.0"
22+
php: "8.0"
1323

14-
name: PHP ${{ matrix.php }}
24+
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
1525

1626
steps:
1727
- name: Checkout code
@@ -25,7 +35,7 @@ jobs:
2535
coverage: none
2636

2737
- name: Install dependencies
28-
run: composer require laravel/framework:^${{ matrix.laravel }}
38+
run: composer require --dev laravel/framework:^${{ matrix.laravel }}
2939

3040
- name: Execute tests
3141
run: sudo vendor/bin/phpunit

.styleci.yml

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

composer.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
"keywords": [
77
"laravel",
88
"routes",
9-
"pretty"
9+
"pretty",
10+
"pretty-routes",
11+
"route",
12+
"routing"
1013
],
1114
"authors": [
1215
{
@@ -41,14 +44,14 @@
4144
"php": "^8.0",
4245
"dragon-code/contracts": "^2.6",
4346
"dragon-code/support": "^6.1",
44-
"illuminate/routing": "^7.0 || ^8.0 || ^9.0",
45-
"illuminate/support": "^7.0 || ^8.0 || ^9.0",
47+
"illuminate/routing": "^7.0 || ^8.0 || ^9.0 || ^10.0",
48+
"illuminate/support": "^7.0 || ^8.0 || ^9.0 || ^10.0",
4649
"phpdocumentor/reflection-docblock": "^5.0"
4750
},
4851
"require-dev": {
4952
"mockery/mockery": "^1.0",
50-
"orchestra/testbench": "^5.0 || ^6.0 || ^7.0",
51-
"phpunit/phpunit": "^9.0"
53+
"orchestra/testbench": "^5.0 || ^6.0 || ^7.0 || ^8.0",
54+
"phpunit/phpunit": "^9.6"
5255
},
5356
"conflict": {
5457
"andrey-helldar/laravel-routes-core": "*",

0 commit comments

Comments
 (0)