Merge branch '3.3' into 3

.travis.yml

@@ -12,12 +12,14 @@ php:
   - 7.0
 
 env:
-  - DB=MYSQL CORE_RELEASE=3
+  - DB=MYSQL CORE_RELEASE=3.3
 
 matrix:
   include:
     - php: 5.6
       env: DB=PGSQL CORE_RELEASE=3
+    - php: 5.6
+      env: DB=PGSQL CORE_RELEASE=3.2
   allow_failures:
     - php: 7.0
 

code/SideReport.php

@@ -88,8 +88,9 @@ class SideReportView extends ViewableData {
 		}
 		
 		if(isset($info['link']) && $info['link']) {
-			$linkBase = singleton('CMSPageEditController')->Link('show') . '/';
-			$link = ($info['link'] === true) ? $linkBase . $record->ID : $info['link'];
+			$link = ($info['link'] === true && $record->hasMethod('CMSEditLink'))
+				? $record->CMSEditLink()
+				: $info['link'];
 			return $prefix . "<a $classClause href=\"$link\">$val</a>";
 		} else {
 			return $prefix . "<span $classClause>$val</span>";

composer.json

@@ -16,7 +16,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.3",
+		"php": ">=5.3.3,<7",
 		"silverstripe/framework": "~3.3"
 	},
 	"extra": {