Skip to content

Commit

Permalink
Merge pull request #18 from rickselby/laravel-5.7
Browse files Browse the repository at this point in the history
Update to support Laravel 5.7
  • Loading branch information
rickselby authored Oct 6, 2022
2 parents 71b6e81 + 79bdea9 commit 8823911
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 37 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Run Tests

on: push

jobs:
phpunit:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php: [7.3, 7.4]
laravel: [5.7.*, 5.8.*]
steps:
- uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}

- run: composer require "laravel/framework:${{ matrix.laravel }}" --no-update -n
- run: composer install --prefer-dist -n

- run: vendor/bin/phpunit
1 change: 0 additions & 1 deletion .styleci.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"laravel/framework": "5.6.*"
"laravel/framework": "5.6.*|5.7.*"
},
"require-dev": {
"graham-campbell/testbench": "^5.0",
Expand All @@ -32,5 +32,8 @@
"RickSelby\\LaravelRequestFieldTypes\\RequestFieldTypesServiceProvider"
]
}
},
"config": {
"allow-plugins": false
}
}
9 changes: 1 addition & 8 deletions tests/AbstractTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@

abstract class AbstractTestCase extends AbstractPackageTestCase
{
/**
* Get the service provider class.
*
* @param \Illuminate\Contracts\Foundation\Application $app
*
* @return string
*/
protected function getServiceProviderClass($app)
protected function getServiceProviderClass()
{
return RequestFieldTypesServiceProvider::class;
}
Expand Down

0 comments on commit 8823911

Please sign in to comment.