Merge remote-tracking branch 'origin/mysql-5.6' into issue-95-point-collection-min-items-mysql-5.6

grimzy · grimzy · commit ad812c60adeb · 2020-03-08T17:45:04.000-04:00
# Conflicts:
#	composer.json
diff --git a/composer.json b/composer.json
@@ -13,14 +13,14 @@
         "php": ">=5.5.9",
         "ext-pdo": "*",
         "ext-json": "*",
-        "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",
+        "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"
diff --git 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()
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,9 @@ protected function newBaseQueryBuilder()`
`66`	`66`	`$connection = $this->getConnection();`
`67`	`67`
`68`	`68`	`return new BaseBuilder(`
`69`		`- $connection, $connection->getQueryGrammar(), $connection->getPostProcessor()`
	`69`	`+ $connection,`
	`70`	`+ $connection->getQueryGrammar(),`
	`71`	`+ $connection->getPostProcessor()`
`70`	`72`	`);`
`71`	`73`	`}`
`72`	`74`