Skip to content

Commit 4f0befe

Browse files
committed
Merge remote-tracking branch 'origin/master' into laravel-7
2 parents 09a0353 + c1c162e commit 4f0befe

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- docker
2020

2121
before_install:
22-
- echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
22+
- echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
2323
- sudo /etc/init.d/mysql stop
2424
- make start_db V=$MYSQL_VERSION
2525

src/Eloquent/SpatialTrait.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ protected function newBaseQueryBuilder()
7575
$connection = $this->getConnection();
7676

7777
return new BaseBuilder(
78-
$connection, $connection->getQueryGrammar(), $connection->getPostProcessor()
78+
$connection,
79+
$connection->getQueryGrammar(),
80+
$connection->getPostProcessor()
7981
);
8082
}
8183

0 commit comments

Comments
 (0)