Skip to content

Commit

Permalink
Add PHP 7.1 to Travis & fix php-cs-fixer
Browse files Browse the repository at this point in the history
I don't want to update the .php_cs to be compatible with php-cs-fixer 2.
It works great like that atm.
  • Loading branch information
j0k3r committed Jan 10, 2017
1 parent ff754b8 commit 6e24a5d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ php:
- 5.5
- 5.6
- 7.0
- 7.1
- nightly
- hhvm

matrix:
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/" }
Expand Down

0 comments on commit 6e24a5d

Please sign in to comment.