Merge pull request #141 from GrahamCampbell/testing

Testing Improvements

.travis.yml

@@ -4,16 +4,12 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
   - hhvm
 
 before_script:
-  - composer self-update
+  - travis_retry composer self-update
-  - composer install --no-interaction --prefer-source --dev
+  - travis_retry composer install --no-interaction --prefer-source --dev
 
 script:
-  - phpunit
+  - vendor/bin/phpunit --verbose
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true

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"
         }
     }
 }