diff --git a/.travis.yml b/.travis.yml index a8fee55..fe6a3aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,14 @@ cache: - $HOME/.composer/cache/files php: - - 5.5 - - 5.6 - - 7.0 - 7.1 - 7.2 + - 7.3 + +branches: + except: + - /^analysis-.*$/ + - /^patch-.*$/ env: - TEST_COMMAND="composer test-all" @@ -19,10 +22,8 @@ env: matrix: fast_finish: true include: - - php: 5.5 + - php: 7.1 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" PREFER_COVERAGE=true - - php: hhvm - dist: trusty install: - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction @@ -33,6 +34,7 @@ before_script: - if [[ "$PREFER_COVERAGE" = true ]] && [[ "$TRAVIS_PULL_REQUEST" = false ]]; then TEST_COMMAND="composer test-coverage" COVERAGE=true; fi script: + - composer validate --strict --no-check-lock - echo $TEST_COMMAND - $TEST_COMMAND diff --git a/composer.json b/composer.json index ad26227..416ca67 100644 --- a/composer.json +++ b/composer.json @@ -2,17 +2,17 @@ "name": "mailgun/mailgun-php", "description": "The Mailgun SDK provides methods for all API functions.", "require": { - "php": "^5.5 || ^7.0", + "php": "^7.1", "php-http/httplug": "^1.0 || ^2.0", "php-http/multipart-stream-builder": "^1.0", - "php-http/client-common": "^1.1", + "php-http/client-common": "^1.9", "php-http/discovery": "^1.0", "webmozart/assert": "^1.2" }, "require-dev": { "phpunit/phpunit": "~4.8", "php-http/guzzle6-adapter": "^1.0", - "guzzlehttp/psr7": "^1.4", + "nyholm/psr7": "^1.0", "nyholm/nsa": "^1.1" }, "autoload": { @@ -41,5 +41,10 @@ "test-all": "vendor/bin/phpunit --testsuite all", "test-integration": "vendor/bin/phpunit --testsuite integration", "test-coverage": "vendor/bin/phpunit --testsuite all --coverage-text --coverage-clover=build/coverage.xml" + }, + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } } }