From 358c294092918d17df1b59078783ee0d0d48afff Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Tue, 3 Nov 2015 11:35:31 +1300
Subject: [PATCH] FIX Tests for 3.2

---
 .travis.yml   | 13 ++++++++-----
 composer.json | 22 ++++++++++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a558db1..7b72a18f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,21 @@
 
 language: php 
 php: 
- - 5.3
+ - 5.6
 
 sudo: false
 
 env:
- - DB=MYSQL CORE_RELEASE=master
- - DB=PGSQL CORE_RELEASE=master
+ - DB=MYSQL CORE_RELEASE=3.2
 
 matrix:
   include:
     - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=master
+      env: DB=PGSQL CORE_RELEASE=3.2
+    - php: 5.3
+      env: DB=MYSQL CORE_RELEASE=3.2
+    - php: 5.5
+      env: DB=MYSQL CORE_RELEASE=3
 
 before_script:
  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
@@ -21,4 +24,4 @@ before_script:
  - cd ~/builds/ss
 
 script: 
- - phpunit reports/tests/
+ - vendor/bin/phpunit reports/tests/
diff --git a/composer.json b/composer.json
index 1bc62e31..bc2941a6 100644
--- a/composer.json
+++ b/composer.json
@@ -4,15 +4,21 @@
 	"homepage": "http://silverstripe.org",
 	"license": "BSD-3-Clause",
 	"keywords": ["silverstripe", "cms", "reports"],
-	"authors": [{
-		"name": "SilverStripe",
-		"homepage": "http://silverstripe.com"
-	}, {
-		"name": "The SilverStripe Community",
-		"homepage": "http://silverstripe.org"
-	}],
+	"authors": [
+		{
+			"name": "SilverStripe",
+			"homepage": "http://silverstripe.com"
+		},
+		{
+			"name": "The SilverStripe Community",
+			"homepage": "http://silverstripe.org"
+		}
+	],
 	"require": {
 		"php": ">=5.3.3",
-		"silverstripe/framework": ">=3.1.x-dev"
+		"silverstripe/framework": "~3.2"
+	},
+	"require-dev": {
+		"phpunit/PHPUnit": "~3.7"
 	}
 }