Merge pull request #18 from mateusz/travis

Fix version dependencies, and fix what travis builds.

.travis.yml

@@ -14,9 +14,9 @@ matrix:
     - php: 5.3
       env: DB=PGSQL CORE_RELEASE=3.1
     - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=master
+      env: DB=MYSQL CORE_RELEASE=3.1
     - php: 5.5
-      env: DB=MYSQL CORE_RELEASE=master
+      env: DB=MYSQL CORE_RELEASE=3.1
 
 before_script:
  - phpenv rehash
@@ -25,4 +25,4 @@ before_script:
  - cd ~/builds/ss
 
 script: 
- - phpunit versionfeed/tests/
+ - phpunit versionfeed/tests/

composer.json

@@ -12,7 +12,7 @@
 	],
 	"require":
 	{
-		"silverstripe/framework": "3.*",
-		"silverstripe/cms": "3.*"
+		"silverstripe/framework": ">=3.1",
+		"silverstripe/cms": ">=3.1"
 	}
-}
+}

tests/VersionFeedFunctionalTest.php

@@ -213,3 +213,4 @@ class VersionFeedFunctionalTest extends FunctionalTest {
 	}
 
 }
+