From 730374d666d06e132e1322f8c19d25671681d432 Mon Sep 17 00:00:00 2001
From: Indy Griffiths <indy@silverstripe.com>
Date: Mon, 14 Oct 2019 16:12:16 +1300
Subject: [PATCH] Remove reference to Object with SS_Object

---
 .travis.yml                     | 17 ++++++++---------
 _config.php                     |  4 ++++
 code/TestSessionEnvironment.php |  2 +-
 composer.json                   |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 66bb0d2..6f9d881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,19 +4,18 @@ language: php
 
 sudo: false
 
-php:
- - 5.5
-
 env:
   matrix:
-    - DB=MYSQL CORE_RELEASE=3.4
+    - DB=MYSQL CORE_RELEASE=3.7
 
 matrix:
   include:
-    - php: 5.3
-      env: DB=MYSQL CORE_RELEASE=3.3
-    - php: 5.5
-      env: DB=MYSQL CORE_RELEASE=3
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=3.7
+    - php: 7.2
+      env: DB=MYSQL CORE_RELEASE=3.7
+    - php: 7.3
+      env: DB=MYSQL CORE_RELEASE=3.7
 
 before_script:
  - phpenv rehash
@@ -25,4 +24,4 @@ before_script:
  - cd ~/builds/ss
 
 script:
- - phpunit testsession/tests/unit/
+ - vendor/bin/phpunit testsession/tests/unit/
diff --git a/_config.php b/_config.php
index f849844..9da9c15 100644
--- a/_config.php
+++ b/_config.php
@@ -25,3 +25,7 @@ if(class_exists('Resque_Event') && class_exists('SSResqueRun')) {
 		}
 	});
 }
+
+if (!class_exists('SS_Object')) {
+	class_alias('Object', 'SS_Object');
+}
diff --git a/code/TestSessionEnvironment.php b/code/TestSessionEnvironment.php
index 85ba1ef..32f1418 100644
--- a/code/TestSessionEnvironment.php
+++ b/code/TestSessionEnvironment.php
@@ -24,7 +24,7 @@
  *
  * See {@link $state} for default information stored in the test session.
  */
-class TestSessionEnvironment extends Object
+class TestSessionEnvironment extends SS_Object
 {
 
     /**
diff --git a/composer.json b/composer.json
index ee86bf7..8e4bc31 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
 	],
 	"require": {
 		"composer/installers": "*",
-		"silverstripe/framework": "^3.2"
+		"silverstripe/framework": "^3.7"
 	},
 	"minimum-stability": "dev"
 }