From 7ab5153560d660b71cb737cc0109000cd622cf40 Mon Sep 17 00:00:00 2001 From: Joseph Estefane Date: Sat, 7 Mar 2020 12:02:36 -0500 Subject: [PATCH 1/2] Laravel 7 compatibility (MySQL 6) --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8e345e42..e0251d60 100644 --- a/composer.json +++ b/composer.json @@ -11,14 +11,14 @@ ], "require": { "php": ">=5.5.9", - "illuminate/database": "^5.2||^6.0", + "illuminate/database": "^5.2||^6.0||^7.0", "geo-io/wkb-parser": "^1.0", "jmikola/geojson": "^1.0" }, "require-dev": { "phpunit/phpunit": "~4.8||~5.7", "mockery/mockery": "^0.9.9", - "laravel/laravel": "^5.2||^6.0", + "laravel/laravel": "^5.2||^6.0||^7.0", "codeclimate/php-test-reporter": "dev-master", "doctrine/dbal": "^2.5", "laravel/browser-kit-testing": "^2.0" From a51d5d380a6f65389ff506d6d31ccd8d3bf5e5fe Mon Sep 17 00:00:00 2001 From: Joseph Estefane Date: Sat, 7 Mar 2020 17:02:53 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI [ci skip] [skip ci] --- src/Eloquent/SpatialTrait.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Eloquent/SpatialTrait.php b/src/Eloquent/SpatialTrait.php index 5ef5c222..54119b59 100755 --- a/src/Eloquent/SpatialTrait.php +++ b/src/Eloquent/SpatialTrait.php @@ -66,7 +66,9 @@ protected function newBaseQueryBuilder() $connection = $this->getConnection(); return new BaseBuilder( - $connection, $connection->getQueryGrammar(), $connection->getPostProcessor() + $connection, + $connection->getQueryGrammar(), + $connection->getPostProcessor() ); }