From 02fecb4184b7faaece73e5d16521210d7b992841 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 27 Jun 2016 15:10:33 +1200
Subject: [PATCH] Lock version of framework to 3.x compatibility

---
 .travis.yml   | 14 +++++---------
 composer.json |  3 +--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a0f41c6..66bb0d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,22 +4,18 @@ language: php
 
 sudo: false
 
-php: 
+php:
  - 5.5
 
 env:
   matrix:
-    - DB=MYSQL CORE_RELEASE=master
+    - DB=MYSQL CORE_RELEASE=3.4
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=master
+    - php: 5.3
+      env: DB=MYSQL CORE_RELEASE=3.3
     - php: 5.5
-      env: DB=MYSQL CORE_RELEASE=master
-    - php: 5.3
-      env: DB=MYSQL CORE_RELEASE=3.2
-    - php: 5.3
       env: DB=MYSQL CORE_RELEASE=3
 
 before_script:
@@ -28,5 +24,5 @@ before_script:
  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
  - cd ~/builds/ss
 
-script: 
+script:
  - phpunit testsession/tests/unit/
diff --git a/composer.json b/composer.json
index bc74336..ee86bf7 100644
--- a/composer.json
+++ b/composer.json
@@ -12,9 +12,8 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.2",
 		"composer/installers": "*",
-		"silverstripe/framework": ">=3.2.0"
+		"silverstripe/framework": "^3.2"
 	},
 	"minimum-stability": "dev"
 }