From a0d0a585f92ac0ad7c78c0d124aaa9ed0c58ebc5 Mon Sep 17 00:00:00 2001 From: Gabriel Peixoto Date: Fri, 26 Jun 2020 12:26:05 -0300 Subject: [PATCH] Compatibilidade com Laravel >=5.7 --- .travis.yml | 20 ++++++++++++++++++-- composer.json | 25 +++++++++++-------------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd55d10..259a4b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,26 @@ cache: - $HOME/.composer/cache/files php: + - 7.1 - 7.2 - 7.3 - - 7.4 env: - - LARAVEL_VERSION=7.0.* + - LARAVEL_VERSION=5.7.* + - LARAVEL_VERSION=5.8.* COVERAGE=true + - LARAVEL_VERSION=6.0.* COVERAGE=true + +matrix: + # For each PHP version we exclude the coverage env, except for PHP 7.1 + exclude: + - php: 7.1 + env: LARAVEL_VERSION=6.0.* COVERAGE=true + - php: 7.1 + env: LARAVEL_VERSION=7.0.* COVERAGE=true + - php: 7.2 + env: LARAVEL_VERSION=6.0.* COVERAGE=true + - php: 7.2 + env: LARAVEL_VERSION=5.7.* before_install: - echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini @@ -26,5 +40,7 @@ before_script: phpenv config-add ~/xdebug.ini script: vendor/bin/phpunit +after_success: sh -c "if [ ! -z ${COVERAGE+x} ]; then travis_retry php vendor/bin/php-coveralls; fi" + notifications: email: false diff --git a/composer.json b/composer.json index 1210df1..40043c8 100644 --- a/composer.json +++ b/composer.json @@ -8,24 +8,21 @@ ], "homepage": "https://github.com/jdavidbakr/MailTracker", "license": "MIT", - "authors": [ - { - "name": "J David Baker", - "email": "me@jdavidbaker.com", - "homepage": "http://www.jdavidbaker.com", - "role": "Developer" - } - ], + "authors": [{ + "name": "J David Baker", + "email": "me@jdavidbaker.com", + "homepage": "http://www.jdavidbaker.com", + "role": "Developer" + }], "require": { - "php": ">=7.2.5", - "laravel/framework": ">=5.7", + "php": ">=7.1", + "laravel/framework": ">=5.7 <7.0", "guzzlehttp/guzzle": "^5.3.1|^6.2.1", - "aws/aws-php-sns-message-validator": "^1.1", - "aws/aws-sdk-php": "^3.133" + "aws/aws-php-sns-message-validator": "^1.1" }, "require-dev": { - "phpunit/phpunit": "~8.0", - "orchestra/testbench": "~5.0", + "phpunit/phpunit": "~6.0|~7.0|~8.0", + "orchestra/testbench": "~3.0|~4.0", "mockery/mockery": "^1.1" }, "suggest": {