Commit 4f0befe

committed

Merge remote-tracking branch 'origin/master' into laravel-7

2 parents 09a0353 + c1c162e commit 4f0befeCopy full SHA for 4f0befe

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ services:`
`19`	`19`	`- docker`
`20`	`20`
`21`	`21`	`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`
`23`	`23`	`- sudo /etc/init.d/mysql stop`
`24`	`24`	`- make start_db V=$MYSQL_VERSION`
`25`	`25`

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)