From b81ba4cb7bd27d8cc7bdca39a77ea49f4c2edec0 Mon Sep 17 00:00:00 2001 From: Rodrigo Pedra Brum Date: Tue, 4 Sep 2018 15:30:23 -0300 Subject: [PATCH] Update to Laravel 5.7 --- .travis.yml | 15 +++++++++++---- composer.json | 12 ++++++------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 66dfea6..9b630d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,8 @@ matrix: env: LARAVEL_VERSION=5.5.* - php: 7.1 env: LARAVEL_VERSION=5.6.* + - php: 7.1 + env: LARAVEL_VERSION=5.7.* - php: 7.2 env: LARAVEL_VERSION=5.1.* - php: 7.2 @@ -54,16 +56,18 @@ matrix: env: LARAVEL_VERSION=5.5.* - php: 7.2 env: LARAVEL_VERSION=5.6.* - - php: hhvm + - php: 7.2 + env: LARAVEL_VERSION=5.7.* + - php: hhvm-3.18 env: LARAVEL_VERSION=5.1.* dist: trusty - - php: hhvm + - php: hhvm-3.18 env: LARAVEL_VERSION=5.2.* dist: trusty - - php: hhvm + - php: hhvm-3.18 env: LARAVEL_VERSION=5.3.* dist: trusty - - php: hhvm + - php: hhvm-3.18 env: LARAVEL_VERSION=5.4.* dist: trusty @@ -75,4 +79,7 @@ before_install: install: - travis_retry composer install --no-suggest --prefer-dist -n -o +before_script: + - if [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then curl -sSfL -o ~/.phpenv/versions/hhvm/bin/phpunit https://phar.phpunit.de/phpunit-5.7.phar ; fi + script: vendor/bin/phpunit \ No newline at end of file diff --git a/composer.json b/composer.json index d10fe12..5362a84 100644 --- a/composer.json +++ b/composer.json @@ -15,12 +15,12 @@ ], "require": { "php": ">=5.5.9", - "illuminate/contracts": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/filesystem": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/http": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/routing": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/view": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", + "illuminate/contracts": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*", + "illuminate/filesystem": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*", + "illuminate/http": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*", + "illuminate/routing": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*", + "illuminate/view": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*", "mrclay/minify": "^2.2" }, "require-dev": {