From 6e24a5d731df235b40345daa8ba69254b94ef054 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 10 Jan 2017 11:04:58 +0100 Subject: [PATCH] Add PHP 7.1 to Travis & fix php-cs-fixer I don't want to update the .php_cs to be compatible with php-cs-fixer 2. It works great like that atm. --- .travis.yml | 5 +++++ composer.json | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32f7f27..a18d7c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 + - nightly - hhvm matrix: @@ -16,6 +18,7 @@ matrix: fast_finish: true allow_failures: - php: hhvm + - php: nightly # faster builds on new travis setup not using sudo sudo: false @@ -32,6 +35,8 @@ before_install: # see: https://blog.travis-ci.com/upcoming_ubuntu_11_10_migration/ - if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- disable-tls true; fi; - if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- secure-http false; fi; + # no version compatible with PHP > 7.1 + - if [[ $TRAVIS_PHP_VERSION = 7.2.* ]]; then composer remove friendsofphp/php-cs-fixer; fi; install: - composer self-update diff --git a/composer.json b/composer.json index 62721e0..31c00f0 100644 --- a/composer.json +++ b/composer.json @@ -25,11 +25,11 @@ }], "require": { "php": ">=5.3.3", - "monolog/monolog": "^1.13.1" + "monolog/monolog": "^1.13" }, "require-dev": { "satooshi/php-coveralls": "~0.6", - "friendsofphp/php-cs-fixer": "*" + "friendsofphp/php-cs-fixer": "<2" }, "autoload": { "psr-4": { "Readability\\": "src/" }