Skip to content

Commit 8daece7

Browse files
authored
Merge pull request #104 from Chrissi2812/mysql-5.6
Laravel 6 Support for Mysql 5.6 Branch
2 parents bb0836a + 968875a commit 8daece7

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ services:
1717
- docker
1818

1919
before_install:
20+
- echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
2021
- sudo /etc/init.d/mysql stop
2122
- make start_db V=$MYSQL_VERSION
2223

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
],
1212
"require": {
1313
"php": ">=5.5.9",
14-
"illuminate/database": "^5.2",
14+
"illuminate/database": "^5.2|^6.0",
1515
"geo-io/wkb-parser": "^1.0",
1616
"jmikola/geojson": "^1.0"
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "~4.8||~5.7",
2020
"mockery/mockery": "^0.9.9",
21-
"laravel/laravel": "^5.2",
21+
"laravel/laravel": "^5.2|^6.0",
2222
"codeclimate/php-test-reporter": "dev-master",
2323
"doctrine/dbal": "^2.5",
2424
"laravel/browser-kit-testing": "^2.0"

0 commit comments

Comments
 (0)