Skip to content

Commit

Permalink
Merge pull request #435 from erikn69/patch-1
Browse files Browse the repository at this point in the history
Laravel 10.x Support
  • Loading branch information
freekmurze authored Feb 3, 2023
2 parents 6774a0e + 3e556b2 commit d522bd2
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 39 deletions.
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
/phpunit.xml.dist export-ignore
/tests export-ignore
/.editorconfig export-ignore
/.php.cs export-ignore
/.github export-ignore

/.php-cs-fixer.dist.php export-ignore
2 changes: 1 addition & 1 deletion .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

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

- name: Fix style
uses: docker://oskarstark/php-cs-fixer-ga
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,24 @@ jobs:
matrix:
os: [ubuntu-latest]
php: [8.2, 8.1, 8.0]
laravel: [9.*, 8.*]
laravel: [10.*, 9.*, 8.*]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*
- laravel: 8.*
testbench: ^6.23
exclude:
- laravel: 10.*
php: 8.0

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

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

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: main

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
],
"require": {
"php": "^8.0",
"illuminate/support": "^9.0|^8.0",
"illuminate/support": "^8.0|^9.0|^10.0",
"spatie/laravel-package-tools": "^1.9"
},
"require-dev": {
"laravel/legacy-factories": "^1.0.4",
"laravel/octane": "^1.0",
"mockery/mockery": "^1.4",
"orchestra/testbench": "^6.23|^7.0",
"orchestra/testbench": "^6.23|^7.0|^8.0",
"pestphp/pest": "^1.22",
"phpunit/phpunit": "^9.4",
"spatie/valuestore": "^1.2"
Expand Down Expand Up @@ -67,4 +67,4 @@
},
"minimum-stability": "dev",
"prefer-stable": true
}
}
30 changes: 0 additions & 30 deletions phpunit.xml.dist.bak

This file was deleted.

0 comments on commit d522bd2

Please sign in to comment.