Merge branch '2.1' into 2.2

.travis.yml

@@ -4,18 +4,20 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 before_script:
   - composer self-update
-  - composer require satooshi/php-coveralls:~0.6 --prefer-source --no-interaction --dev
+  - composer require satooshi/php-coveralls:~0.6.1 --prefer-source --no-interaction --dev
 
 script: vendor/bin/phpunit -c phpunit.xml --coverage-text
 
 after_script:
-  - if [[ "$TRAVIS_PHP_VERSION" != *hhvm* ]]; then php vendor/bin/coveralls -v; fi
+  - if [[ "$TRAVIS_PHP_VERSION" == *5.6* ]]; then php vendor/bin/coveralls -v; fi
 
 matrix:
   allow_failures:
+    - php: 7.0
     - php: hhvm
   fash_finish: true