Merge pull request #5183 from dhensby/pulls/2.4/travis-fix

Update travis config

.travis.yml

@@ -1,18 +1,34 @@
-language: php 
+language: php
-php: 
+
- - 5.3
+sudo: false
 
 env:
- - TESTDB=MYSQL CORE_RELEASE=2.4
+  global:
- - TESTDB=PGSQL CORE_RELEASE=2.4
+    - CORE_RELEASE=2.4
+    - secure: "DjwZKhY/c0wXppGmd8oEMiTV0ayfOXiCmi9Lg1aXoSXNnj+sjLmhYwhUWjehjR6IX0MRtzJG6v7V5Y+4nSGe+i+XIrBQnhPQ95Jrkm1gKofX2mznWTl9npQElNS1DXi58NLPbiB3qxHWGFBRAWmRQrsAouyZabkPnChnSa9ldOg="
+    - secure: "UmbXCNLK0f2Dk+7qX8bOVcgIt4QhRvccoWvMUxaPtIU+95HCbG10eeCxvfOeBax+tHcRXmeCG4vM4tcuT/WoANkAma/VX74DylFjbWhks2tsKOcr2kjTrOwe6Q9CXOBjVAlcx0lnV/a+w83KARjXGnCrIbE7p7r4EDw31rkVufg="
+
+matrix:
+  include:
+    - php: 5.3
+      env: DB=MYSQL
+    - php: 5.3
+      env: DB=PGSQL
+    - php: 5.4
+      env: DB=MYSQL
+    - php: 5.5
+      env: DB=MYSQL
+    - php: 5.6
+      env: DB=MYSQL
 
 before_script:
+ - composer self-update || true
  - phpenv rehash
  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
  - cd ~/builds/ss
 
-script: 
+script:
  - vendor/bin/phpunit sapphire/tests
 
 branches:
@@ -20,10 +36,4 @@ branches:
     - 2.1
     - 2.2
     - 2.3
-    - post-2.4
+    - translation-staging
-    - translation-staging
-
-notifications:
-  irc:
-    channels:
-     - "irc.freenode.org#silverstripe"