From 460be120e59c9b63fd67d3d4fbb5e95c76e0e9a6 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@mineuk.com>
Date: Sat, 26 Jul 2014 12:04:43 +0100
Subject: [PATCH] Testing improvements

---
 .travis.yml   | 12 ++++--------
 composer.json |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9095663..2b445bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,16 +4,12 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
   - hhvm
 
 before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
+  - travis_retry composer self-update
+  - travis_retry composer install --no-interaction --prefer-source --dev
 
 script:
-  - phpunit
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
+  - vendor/bin/phpunit --verbose
diff --git a/composer.json b/composer.json
index bbd931c..49c16d3 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "psr/log": "~1.0"
     },
     "require-dev": {
-        "php": ">=5.3.0"
+        "phpunit/phpunit": "~4.0"
     },
     "autoload": {
         "psr-0": {"DebugBar": "src/"}
@@ -27,7 +27,7 @@
     },
      "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "1.9-dev"
         }
     }
 }