From 6e62d65ca30ddf5358252aa4bf621ada62024861 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dan@hens.by>
Date: Thu, 5 May 2016 16:18:02 +0100
Subject: [PATCH 1/2] FIX Backlink computed correctly

---
 code/cms/DMSDocumentAddController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cms/DMSDocumentAddController.php b/code/cms/DMSDocumentAddController.php
index 428fdcf..475fbb1 100644
--- a/code/cms/DMSDocumentAddController.php
+++ b/code/cms/DMSDocumentAddController.php
@@ -175,7 +175,7 @@ class DMSDocumentAddController extends LeftAndMain
     public function Backlink()
     {
         $pageID = $this->currentPageID();
-        return singleton('CMSPagesController')->Link().'edit/show/'.$pageID;
+        return Controller::join_links(singleton('CMSPagesController')->Link(), 'edit/show', $pageID);
     }
 
     public function documentautocomplete()

From f16612d0ca50f839e378a2e9dff85523b1e1e596 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Fri, 15 Jul 2016 16:05:34 +0100
Subject: [PATCH 2/2] Adding more travis tests

---
 .travis.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4e063e1..2c73167 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,27 @@
 # See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
 
-language: php 
-php: 
- - 5.3
+sudo: false
+
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
 
 env:
- - DB=MYSQL CORE_RELEASE=3.0
+  - DB=MYSQL CORE_RELEASE=3.0
 
 matrix:
-  include:
-    - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=3.0
+  fast_finish: true
 
 before_script:
- - 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
+  - composer self-update || true
+  - 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
+  - composer install
 
-script: 
- - phpunit dms/tests/
+script:
+  - vendor/bin/phpunit dms/tests