From 96fca22189043367c46e2680bc26266a4887b9b3 Mon Sep 17 00:00:00 2001 From: Erik Gaal Date: Mon, 29 Oct 2018 15:13:51 +0100 Subject: [PATCH 1/5] Add Laravel 5.7 build configuration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be461104..5934e73c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ php: - 7.2 env: - - TESTBENCH_VERSION="3.6.*" PHPUNIT_VERSION="7.0.*" # Laravel 5.6 + - TESTBENCH_VERSION="3.7.*" PHPUNIT_VERSION="7.0.*" # Laravel 5.7 install: - travis_retry composer self-update From cfe84d3f5e8fa717c29c7218232bd3a28180ed5a Mon Sep 17 00:00:00 2001 From: Erik Gaal Date: Mon, 29 Oct 2018 15:14:37 +0100 Subject: [PATCH 2/5] Add Laravel 5.7 to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f36888ea..cd6ba4ce 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ An on-the-fly GraphQL Schema generator from Eloquent models for Laravel. | 5.4.x | 1.0.x | | 5.5.x | 1.0.x | | 5.6.x | 2.0.x | +| 5.7.x | 2.1.x | ## Installation From aca695aeb5f4d208840d342a1779d310e515be3a Mon Sep 17 00:00:00 2001 From: Erik Gaal Date: Mon, 29 Oct 2018 15:14:37 +0100 Subject: [PATCH 3/5] Update Laravel to 5.7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e35d628a..50fdc67f 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^7.1", - "laravel/framework": "5.6.*", + "laravel/framework": "5.7.*", "webonyx/graphql-php": "^0.12.5" }, "require-dev": { From 4a5297cd6337b838c4f836da6da55fa27cf3880a Mon Sep 17 00:00:00 2001 From: Erik Gaal Date: Mon, 29 Oct 2018 16:41:07 +0100 Subject: [PATCH 4/5] Update to work with orchestra/testbench 3.7 --- composer.json | 6 +++--- tests/FeatureTestCase.php | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 50fdc67f..a9fc3444 100644 --- a/composer.json +++ b/composer.json @@ -19,11 +19,11 @@ "require": { "php": "^7.1", "laravel/framework": "5.7.*", - "webonyx/graphql-php": "^0.12.5" + "webonyx/graphql-php": "^0.12.5", + "mockery/mockery": "^1.2" }, "require-dev": { - "orchestra/database": "^3.4", - "orchestra/testbench": "^3.4", + "orchestra/testbench": "~3.0", "phpunit/phpunit": "^7.1" }, "autoload": { diff --git a/tests/FeatureTestCase.php b/tests/FeatureTestCase.php index 2b33cd18..96f4bc2f 100644 --- a/tests/FeatureTestCase.php +++ b/tests/FeatureTestCase.php @@ -7,7 +7,6 @@ use Bakery\Support\Facades\Bakery; use Illuminate\Contracts\Auth\Access\Gate; use Bakery\Tests\Stubs\Types\TimestampType; -use Orchestra\Database\ConsoleServiceProvider; use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; class FeatureTestCase extends TestCase @@ -66,7 +65,6 @@ protected function getPackageProviders($app) { return [ BakeryServiceProvider::class, - ConsoleServiceProvider::class, ]; } From 609b1f3c2b16c19a80715cddf3ffdbffc962eb8e Mon Sep 17 00:00:00 2001 From: Erik Gaal Date: Tue, 20 Nov 2018 09:45:59 +0100 Subject: [PATCH 5/5] Add back 5.6 support? --- .travis.yml | 5 +++-- composer.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5934e73c..fbd23380 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,12 @@ php: - 7.2 env: - - TESTBENCH_VERSION="3.7.*" PHPUNIT_VERSION="7.0.*" # Laravel 5.7 + - TESTBENCH_VERSION="3.6.*" # Laravel 5.6 + - TESTBENCH_VERSION="3.7.*" # Laravel 5.7 install: - travis_retry composer self-update - - travis_retry composer require orchestra/testbench:${TESTBENCH_VERSION} phpunit/phpunit:${PHPUNIT_VERSION} + - travis_retry composer require orchestra/testbench:${TESTBENCH_VERSION} - travis_retry composer install --no-interaction script: diff --git a/composer.json b/composer.json index e045db2e..9dc17915 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": ">=7.1.0", - "illuminate/support": "5.7.*", + "illuminate/support": "5.6.*|5.7.*", "webonyx/graphql-php": "^0.12.0", "ext-json": "*" },