From 24fec3aeb769da198f599dd386a13070c448e52d Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 5 May 2014 09:15:18 +1200
Subject: [PATCH] Update travis configuration to use composer phpunit

---
 .travis.yml   | 2 +-
 composer.json | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 00c99aab..20c9a9bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_script:
  - cd ~/builds/ss
 
 script: 
- - phpunit cms/tests/
+ - vendor/bin/phpunit cms/tests/
 
 branches:
   except:
diff --git a/composer.json b/composer.json
index 785a4c70..91843756 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,9 @@
 		"composer/installers": "*",
 		"silverstripe/framework": "3.0.*"
 	},
+	"require-dev": {
+		"phpunit/PHPUnit": "~3.7"
+	},
 	"autoload": {
 		"classmap": ["tests/behat/"]
 	}