Skip to content

Commit

Permalink
Allow Laravel 5.8
Browse files Browse the repository at this point in the history
  • Loading branch information
dvlpp committed Apr 4, 2019
1 parent b0d0ab0 commit bfd5557
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
6 changes: 2 additions & 4 deletions .travis.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
language: php

php:
- 7.0
- 7.1
- 7.2

env:
- LARAVEL_VERSION=5.5.*
- LARAVEL_VERSION=5.6.*
- LARAVEL_VERSION=5.7.*
- LARAVEL_VERSION=5.8.*

matrix:
fast_finish: true
exclude:
- php: 7.0
env: LARAVEL_VERSION=5.6.*

before_script:
- travis_retry composer self-update
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
}
],
"require": {
"illuminate/support": "5.6.*|5.7.*",
"illuminate/support": "5.6.*|5.7.*|5.8.*",
"guzzlehttp/guzzle": "^6.3"
},
"require-dev": {
"phpunit/phpunit": "7.0.*",
"orchestra/testbench": "3.6.*|3.7.*",
"phpunit/phpunit": "7.0.*|7.5.*",
"orchestra/testbench": "3.6.*|3.7.*|3.8.*",
"code16/machina": "dev-master"
},
"autoload": {
Expand Down
1 change: 0 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="./vendor/autoload.php"
>
<testsuites>
Expand Down
7 changes: 4 additions & 3 deletions tests/MachinaClientTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@

namespace Code16\MachinaClient\Tests;

use Schema;
use Code16\Machina\MachinaServiceProvider;
use Code16\MachinaClient\MachinaClientServiceProvider;
use Orchestra\Testbench\TestCase;
use Code16\MachinaClient\Tests\Stubs\Client;
use Code16\MachinaClient\Tests\Stubs\TestClient;
use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\Handler\MockHandler;
use GuzzleHttp\HandlerStack;
use Illuminate\Support\Facades\Schema;
use Orchestra\Testbench\TestCase;

abstract class MachInaClientTestCase extends TestCase
{
public function setUp()
public function setUp(): void
{
parent::setUp();

Schema::create('clients', function($table) {
$table->increments('id');
$table->string('secret');
Expand Down

0 comments on commit bfd5557

Please sign in to comment.