Skip to content

Commit

Permalink
Merge pull request #3 from datalogix/support-laravel-10
Browse files Browse the repository at this point in the history
Support laravel 10
  • Loading branch information
ricardogobbosouza authored Jun 12, 2023
2 parents 91735c3 + 67034c5 commit acf7277
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 21 deletions.
16 changes: 16 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
* text=auto eol=lf

*.blade.php diff=html
*.css diff=css
*.html diff=html
*.md diff=markdown
*.php diff=php

/.github export-ignore
/tests export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.styleci.yml export-ignore
.phpunit-watcher.yml export-ignor
README.md export-ignore
phpunit.xml.dist export-ignore
16 changes: 9 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,26 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
php: [7.3, 7.4, 8.0, 8.1]
laravel: [^7.0, ^8.0, ^9.0]
php: [7.4, 8.0, 8.1]
laravel: [^8.0, ^9.0, ^10.0]
#stability: [prefer-lowest, prefer-stable]
stability: [prefer-stable]
exclude:
- php: 7.3
laravel: 9
- php: 7.4
laravel: 9
- php: 7.4
laravel: 10
- php: 8.0
laravel: 10

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

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

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.composer/cache/files
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
Expand All @@ -46,4 +48,4 @@ jobs:
run: vendor/bin/phpunit --verbose

- name: Coverage
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v3
8 changes: 1 addition & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
vendor
composer.phar
/vendor
composer.lock
.DS_Store
Thumbs.db
phpunit.xml
clover.xml
.idea
.vscode
.phpunit.result.cache
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
}
],
"require": {
"php": "^7.3|^8.0",
"illuminate/support": "^7.0|^8.0|^9.0",
"php": "^7.4|^8.0",
"illuminate/support": "^8.0|^9.0|^10.0",
"respect/validation": "^2.2"
},
"require-dev": {
"graham-campbell/testbench": "^5.7",
"mockery/mockery": "^1.4",
"phpunit/phpunit": "^8.5|^9.5",
"spatie/phpunit-watcher": "^1.0"
"graham-campbell/testbench": "^6.0",
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^9.5|^10.0",
"spatie/phpunit-watcher": "^1.23"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ abstract class TestCase extends AbstractPackageTestCase
*
* @return string
*/
protected function getServiceProviderClass()
protected static function getServiceProviderClass(): string
{
return ValidationServiceProvider::class;
}
Expand Down

0 comments on commit acf7277

Please sign in to comment.