From b9f2f1d4b3caa843126aa3978f4d39b28d87f32a Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Fri, 1 Dec 2017 12:00:12 +0000
Subject: [PATCH 1/2] Add PHP7.2 support

---
 code/controllers/AssetAdmin.php            | 2 +-
 code/controllers/CMSMain.php               | 2 +-
 code/controllers/CMSSiteTreeFilter.php     | 2 +-
 code/controllers/SilverStripeNavigator.php | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index bce918de..cbf7be7e 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -422,7 +422,7 @@ JS
 		$actions = new FieldList(
 			FormAction::create('doSearch',  _t('CMSMain_left_ss.APPLY_FILTER', 'Apply Filter'))
 				->addExtraClass('ss-ui-action-constructive'),
-			Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.RESET', 'Reset'))
+			SS_Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.RESET', 'Reset'))
 		);
 
 		$form = new Form($this, 'filter', $fields, $actions);
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index a67d020d..2c25e083 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -368,7 +368,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		$actions = new FieldList(
 			FormAction::create('doSearch',  _t('CMSMain_left_ss.APPLY_FILTER', 'Search'))
 				->addExtraClass('ss-ui-action-constructive'),
-			Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.CLEAR_FILTER', 'Clear'))
+			SS_Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.CLEAR_FILTER', 'Clear'))
 		);
 
 		// Use <button> to allow full jQuery UI styling on the all of the Actions
diff --git a/code/controllers/CMSSiteTreeFilter.php b/code/controllers/CMSSiteTreeFilter.php
index 3479eb64..249f7c8e 100644
--- a/code/controllers/CMSSiteTreeFilter.php
+++ b/code/controllers/CMSSiteTreeFilter.php
@@ -13,7 +13,7 @@
  * @package cms
  * @subpackage content
  */
-abstract class CMSSiteTreeFilter extends Object implements LeftAndMain_SearchFilter {
+abstract class CMSSiteTreeFilter extends SS_Object implements LeftAndMain_SearchFilter {
 
 	/**
 	 * @var Array Search parameters, mostly properties on {@link SiteTree}.
diff --git a/code/controllers/SilverStripeNavigator.php b/code/controllers/SilverStripeNavigator.php
index 7002a0b9..baafee56 100644
--- a/code/controllers/SilverStripeNavigator.php
+++ b/code/controllers/SilverStripeNavigator.php
@@ -196,7 +196,7 @@ class SilverStripeNavigatorItem extends ViewableData {
 	 * @return boolean
 	 */
 	public function isArchived() {
-		if(!Object::has_extension($this->record->ClassName, 'Versioned')) return false;
+		if(!SS_Object::has_extension($this->record->ClassName, 'Versioned')) return false;
 
 		if(!isset($this->record->_cached_isArchived)) {
 			$baseTable = ClassInfo::baseDataClass($this->record->class);
@@ -294,7 +294,7 @@ class SilverStripeNavigatorItem_StageLink extends SilverStripeNavigatorItem {
 	
 	public function canView($member = null) {
 		return (
-			Object::has_extension($this->record->ClassName, 'Versioned')
+			SS_Object::has_extension($this->record->ClassName, 'Versioned')
 			&& $this->getDraftPage()
 			// Don't follow redirects in preview, they break the CMS editing form
 			&& !($this->record instanceof RedirectorPage)
@@ -351,7 +351,7 @@ class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem {
 	
 	public function canView($member = null) {
 		return (
-			Object::has_extension($this->record->ClassName, 'Versioned')
+			SS_Object::has_extension($this->record->ClassName, 'Versioned')
 			&& $this->getLivePage()
 			// Don't follow redirects in preview, they break the CMS editing form
 			&& !($this->record instanceof RedirectorPage)
@@ -418,7 +418,7 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem {
 	
 	public function canView($member = null) {
 		return (
-			Object::has_extension($this->record->ClassName, 'Versioned')
+			SS_Object::has_extension($this->record->ClassName, 'Versioned')
 			&& $this->isArchived()
 			// Don't follow redirects in preview, they break the CMS editing form
 			&& !($this->record instanceof RedirectorPage)

From 23d84e6285fa12a3413708aa5345e4dfb1cf037f Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Thu, 1 Feb 2018 17:24:00 +0000
Subject: [PATCH 2/2] Make travis test against 3.x-dev

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 987a42ed..71f63bc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
 
 env:
   global:
-    - CORE_RELEASE=3.5
+    - CORE_RELEASE=3
 
 matrix:
   include: