Commit 2d3139d

committed

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

# Conflicts: # composer.json

2 parents 35f8031 + 2960628 commit 2d3139dCopy full SHA for 2d3139d

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ class Place extends Model`
`140`	`140`	```php
`141`	`141`	`use Grimzy\LaravelMysqlSpatial\Types\Point;`
`142`	`142`	`use Grimzy\LaravelMysqlSpatial\Types\Polygon;`
	`143`	`+use Grimzy\LaravelMysqlSpatial\Types\LineString;`
`143`	`144`
`144`	`145`	`$place1 = new Place();`
`145`	`146`	`$place1->name = 'Empire State Building';`

Lines changed: 2 additions & 2 deletions

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,9 @@ protected function newBaseQueryBuilder()`
`75`	`75`	`$connection = $this->getConnection();`
`76`	`76`
`77`	`77`	`return new BaseBuilder(`
`78`		`- $connection, $connection->getQueryGrammar(), $connection->getPostProcessor()`
	`78`	`+ $connection,`
	`79`	`+ $connection->getQueryGrammar(),`
	`80`	`+ $connection->getPostProcessor()`
`79`	`81`	`);`
`80`	`82`	`}`
`81`	`83`

Comments

(0)