Skip to content
This repository has been archived by the owner on Apr 5, 2019. It is now read-only.

Update for Laravel 5.8 #30

Open
wants to merge 8 commits into
base: 5.7
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php
sudo: false
php:
- 7.1
- 7.2

env:
Expand All @@ -12,11 +11,11 @@ env:
matrix:
fast_finish: true
include:
- php: 7.1
- php: 7.2
env: setup=lowest
- php: 7.1
- php: 7.2
env: setup=stable
- php: 7.1
- php: 7.2
env: coverage=yes

cache:
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@
}
],
"require": {
"php": ">=7.1.3",
"illuminate/support": "5.7.*",
"illuminate/database": "5.7.*"
"php": ">=7.2",
"illuminate/support": "5.8.*",
"illuminate/database": "5.8.*"
},
"autoload": {
"psr-4": {
"Ultraware\\Roles\\": "src/"
}
},
"require-dev": {
"orchestra/testbench": "^3.6",
"orchestra/database": "^3.6",
"orchestra/testbench": "^3.8",
"orchestra/database": "^3.8",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "~7.0",
"phpunit/phpunit": "~8.0",
PawelDmochowskiDRAST marked this conversation as resolved.
Show resolved Hide resolved
"satooshi/php-coveralls": "^2.0",
"sebastian/environment": "^3.1"
"sebastian/environment": "^4.1"
},
"autoload-dev": {
"classmap": [
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class TestCase extends TestBenchTestCase
{
public function setUp()
public function setUp(): void
{
parent::setUp();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Traits/HasRoleAndPermissionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class HasRoleAndPermissionTest extends \TestCase
{
public function setUp()
public function setUp(): void
{
parent::setUp();
$this->withFactories(__DIR__ . '/../../database/factories');
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Traits/PermissionHasRelationsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class PermissionHasRelationsTest extends \TestCase
{
public function setUp()
public function setUp(): void
{
parent::setUp();
$this->withFactories(__DIR__ . '/../../database/factories');
Expand Down