Skip to content

Commit

Permalink
Merge pull request #19 from TheDragonCode/1.x
Browse files Browse the repository at this point in the history
Added Laravel 10 support
  • Loading branch information
andrey-helldar authored Feb 15, 2023
2 parents fa5f681 + 70a8a5b commit af6ecf6
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 105 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: code-style

on:
push:
pull_request:

permissions: write-all

jobs:
check:
if: ${{ ! (github.event_name == 'push' && github.ref == 'refs/heads/main') }}

runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Checking PHP Syntax
uses: TheDragonCode/[email protected]

fix:
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Checking PHP Syntax
uses: TheDragonCode/[email protected]
with:
github_token: ${{ secrets.COMPOSER_TOKEN }}
fix: true
31 changes: 0 additions & 31 deletions .github/workflows/laravel-8.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .github/workflows/laravel-9.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/lint-check.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/lint-fixer.yml

This file was deleted.

26 changes: 21 additions & 5 deletions .github/workflows/laravel-7.yml → .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: "Laravel 7"
name: phpunit

on: [ push ]

jobs:
Expand All @@ -8,10 +9,25 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [ "7.4", "8.0" ]
laravel: [ "7.0" ]
php: [ "7.4", "8.0", "8.1", "8.2" ]
laravel: [ "7.0", "8.0", "9.0", "10.0" ]
exclude:
- laravel: "7.0"
php: "8.1"

- laravel: "7.0"
php: "8.2"

- laravel: "9.0"
php: "7.4"

- laravel: "10.0"
php: "7.4"

- laravel: "10.0"
php: "8.0"

name: PHP ${{ matrix.php }}
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}

steps:
- name: Checkout code
Expand All @@ -28,4 +44,4 @@ jobs:
run: composer require --dev laravel/framework:^${{ matrix.laravel }}

- name: Execute tests
run: sudo vendor/bin/phpunit --colors=always
run: sudo vendor/bin/phpunit
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ DELETE /pages/{page} pages.destroy
This package is licensed under the [MIT License](LICENSE).


[badge_build]: https://img.shields.io/github/workflow/status/TheDragonCode/laravel-route-names/Laravel%209/main?style=flat-square
[badge_build]: https://img.shields.io/github/actions/workflow/status/TheDragonCode/laravel-route-names/phpunit.yml?style=flat-square

[badge_downloads]: https://img.shields.io/packagist/dt/dragon-code/laravel-route-names.svg?style=flat-square

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
"require": {
"php": "^7.4 || ^8.0",
"fig/http-message-util": "^1.1",
"illuminate/routing": "^7.0 || ^8.0 || ^9.0"
"illuminate/routing": "^7.0 || ^8.0 || ^9.0 || ^10.0"
},
"require-dev": {
"dragon-code/extended-routes": "^3.1",
"orchestra/testbench": "^5.0 || ^6.0 || ^7.0",
"phpunit/phpunit": "^9.5"
"dragon-code/extended-routes": "^3.2",
"orchestra/testbench": "^5.0 || ^6.0 || ^7.0 || ^8.0",
"phpunit/phpunit": "^9.6"
},
"minimum-stability": "stable",
"prefer-stable": true,
Expand Down

0 comments on commit af6ecf6

Please sign in to comment.