Merge branch 'develop' of github.com:ManneW/HipChatBundle

* 'develop' of github.com:ManneW/HipChatBundle: Hopefully fixed the Travis CI configuration. Updated Travis CI configuration to also test against PHP 5.6 and HHVM.
ManneW · Jul 29, 2014 · 246a629 · 246a629
2 parents a4b121b + f27ce4d
commit 246a629
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,14 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - hhvm
+
+matrix:
+  allow_failures:
+      - php: hhvm
 
 before_script:
   - composer install --dev --prefer-source
 
-script: phpunit
+script: phpunit --coverage-text