diff --git a/.travis.yml b/.travis.yml index 00f9ce04..e39c3e0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ services: - docker before_install: + - echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - sudo /etc/init.d/mysql stop - make start_db V=$MYSQL_VERSION diff --git a/composer.json b/composer.json index 8947186e..0026da46 100644 --- a/composer.json +++ b/composer.json @@ -11,14 +11,14 @@ ], "require": { "php": ">=5.5.9", - "illuminate/database": "^5.2", + "illuminate/database": "^5.2|^6.0", "geo-io/wkb-parser": "^1.0", "jmikola/geojson": "^1.0" }, "require-dev": { "phpunit/phpunit": "~4.8||~5.7", "mockery/mockery": "^0.9.9", - "laravel/laravel": "^5.2", + "laravel/laravel": "^5.2|^6.0", "codeclimate/php-test-reporter": "dev-master", "doctrine/dbal": "^2.5", "laravel/browser-kit-testing": "^2.0"