Merge pull request #37 from open-sausages/pulls/1.0/3xcompat

Lock version of framework to 3.x compatibility

.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
+    - php: 5.3
-      env: DB=PGSQL CORE_RELEASE=master
+      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/

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