Merge remote-tracking branch 'origin/v4' into v4

grimzy · grimzy · commit 99894363917e · 2020-09-20T20:42:40.000-04:00
# Conflicts:
#	composer.json
diff --git a/composer.json b/composer.json
@@ -18,13 +18,13 @@
         "php": ">=7.3",
         "ext-pdo": "*",
         "ext-json": "*",
-        "illuminate/database": "^5.2|^6.0|^7.0",
+        "illuminate/database": "^8.0",
         "geo-io/wkb-parser": "^1.0",
         "jmikola/geojson": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.5",
-        "laravel/laravel": "^5.2|^6.0|^7.0",
+        "laravel/laravel": "^8.0",
         "doctrine/dbal": "^2.5",
         "laravel/browser-kit-testing": "^2.0",
         "mockery/mockery": "^1.3"
diff --git a/src/Eloquent/BaseBuilder.php b/src/Eloquent/BaseBuilder.php
@@ -6,7 +6,7 @@
 
 class BaseBuilder extends QueryBuilder
 {
-    protected function cleanBindings(array $bindings)
+    public function cleanBindings(array $bindings)
     {
         $spatialBindings = [];
         foreach ($bindings as &$binding) {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class BaseBuilder extends QueryBuilder`
`8`	`8`	`{`
`9`		`- protected function cleanBindings(array $bindings)`
	`9`	`+ public function cleanBindings(array $bindings)`
`10`	`10`	`{`
`11`	`11`	`$spatialBindings = [];`
`12`	`12`	`foreach ($bindings as &$binding) {`