Skip to content

Commit 9989436

committed

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

# Conflicts: # composer.json

2 parents 04e0615 + a6a238f commit 9989436Copy full SHA for 9989436

File tree

2 files changed

+3

-3

lines changed

composer.json
src/Eloquent
- BaseBuilder.php

2 files changed

+3

-3

lines changed

`‎composer.json‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,13 @@`
`18`	`18`	`"php": ">=7.3",`
`19`	`19`	`"ext-pdo": "*",`
`20`	`20`	`"ext-json": "*",`
`21`		`- "illuminate/database": "^5.2\|^6.0\|^7.0",`
	`21`	`+ "illuminate/database": "^8.0",`
`22`	`22`	`"geo-io/wkb-parser": "^1.0",`
`23`	`23`	`"jmikola/geojson": "^1.0"`
`24`	`24`	`},`
`25`	`25`	`"require-dev": {`
`26`	`26`	`"phpunit/phpunit": "~6.5",`
`27`		`- "laravel/laravel": "^5.2\|^6.0\|^7.0",`
	`27`	`+ "laravel/laravel": "^8.0",`
`28`	`28`	`"doctrine/dbal": "^2.5",`
`29`	`29`	`"laravel/browser-kit-testing": "^2.0",`
`30`	`30`	`"mockery/mockery": "^1.3"`

`‎src/Eloquent/BaseBuilder.php‎`

Lines changed: 1 addition & 1 deletion

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) {`

0 commit comments

Comments

(0)