Merge branch 'master' into fix_prefixed_ss_file

.scrutinizer.yml

@@ -4,7 +4,7 @@ filter:
 tools:
     external_code_coverage:
         timeout: 600 # Wait 10 minutes for results
-        runs: 3 # Merge results for 5.4, 5.5 and 5.6 jobs
+        runs: 1 # Results are only coming from the PHP 7.1 job
     php_mess_detector: true
     php_code_sniffer:
         config:

.travis.yml

@@ -1,11 +1,14 @@
 language: php
 
+dist: trusty
+
 php:
   - 5.4
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
+  - hhvm-3.6
 
 cache:
   directories:
@@ -19,5 +22,8 @@ script:
   - php vendor/bin/phpunit --coverage-clover=build/logs/coverage.clover
 
 after_script:
-  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - |
-  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover; fi
+    if [[ "$TRAVIS_PHP_VERSION" == '7.1' ]]; then
+      wget https://scrutinizer-ci.com/ocular.phar
+      php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover
+    fi

README.md

@@ -43,9 +43,7 @@ For information, the performance tests take about 30 minutes to run (processing
 
 ## Support
 
-Need to contact us directly? Email oss@box.com and be sure to include the name of this project in the subject.
+You can ask questions, submit new features ideas or discuss about Spout in the chat room:<br>
-
-You can also ask questions, submit new features ideas or discuss about Spout in the chat room:<br>
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/box/spout?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 ## Copyright and License