Merge pull request #1009 from tractorcow/pulls/3.0-travis

Update travis configuration to use composer phpunit

.travis.yml

@@ -23,7 +23,7 @@ before_script:
  - cd ~/builds/ss
 
 script: 
- - phpunit cms/tests/
+ - vendor/bin/phpunit cms/tests/
 
 branches:
   except:

composer.json

@@ -20,6 +20,9 @@
 		"composer/installers": "*",
 		"silverstripe/framework": "3.0.*"
 	},
+	"require-dev": {
+		"phpunit/PHPUnit": "~3.7"
+	},
 	"autoload": {
 		"classmap": ["tests/behat/"]
 	}