diff --git a/.travis.yml b/.travis.yml
index 450b7db..8896186 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,17 +4,24 @@ language: php
 
 sudo: false
 
+dist: trusty
+
 matrix:
   include:
     - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=3.5
+      env: DB=MYSQL CORE_RELEASE=3.7
     - php: 5.5
-      env: DB=MYSQL CORE_RELEASE=3.6
+      env: DB=MYSQL CORE_RELEASE=3.7
     - php: 5.6
+      env: DB=MYSQL CORE_RELEASE=3.7
+    - php: 7.0
+      env: DB=MYSQL CORE_RELEASE=3
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=3
+    - php: 7.2
+      env: DB=PGSQL CORE_RELEASE=3
+    - php: 7.3
       env: DB=MYSQL CORE_RELEASE=3
-
-before_install:
-  - echo "extension=ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 before_script:
   - composer self-update || true
diff --git a/code/control/LDAPSecurityController.php b/code/control/LDAPSecurityController.php
index 3b4c21e..9da29d9 100644
--- a/code/control/LDAPSecurityController.php
+++ b/code/control/LDAPSecurityController.php
@@ -42,7 +42,7 @@ public static function getPasswordResetLink($member, $autologinToken)
      */
     public function ChangePasswordForm()
     {
-        return Object::create('LDAPChangePasswordForm', $this, 'ChangePasswordForm');
+        return SS_Object::create('LDAPChangePasswordForm', $this, 'ChangePasswordForm');
     }
 
     public function lostpassword()
diff --git a/code/helpers/SAMLHelper.php b/code/helpers/SAMLHelper.php
index b28f31f..ba48cf4 100644
--- a/code/helpers/SAMLHelper.php
+++ b/code/helpers/SAMLHelper.php
@@ -5,7 +5,7 @@
  * SAMLHelper acts as a simple wrapper for the OneLogin implementation, so that we can configure
  * and inject it via the config system.
  */
-class SAMLHelper extends Object
+class SAMLHelper extends SS_Object
 {
     /**
      * @var array
diff --git a/code/model/LDAPGateway.php b/code/model/LDAPGateway.php
index 0566b0d..b5605aa 100644
--- a/code/model/LDAPGateway.php
+++ b/code/model/LDAPGateway.php
@@ -5,7 +5,7 @@
  * Works within the LDAP domain model to provide basic operations.
  * These are exclusively used in LDAPService for constructing more complex operations.
  */
-class LDAPGateway extends Object
+class LDAPGateway extends SS_Object
 {
     /**
      * @var array
diff --git a/code/services/LDAPService.php b/code/services/LDAPService.php
index 5648a40..2417dce 100644
--- a/code/services/LDAPService.php
+++ b/code/services/LDAPService.php
@@ -12,7 +12,7 @@
  *
  * LDAPService relies on Zend LDAP module's data structures for some parameters and some return values.
  */
-class LDAPService extends Object implements Flushable
+class LDAPService extends SS_Object implements Flushable
 {
     /**
      * @var array
diff --git a/code/services/SAMLConfiguration.php b/code/services/SAMLConfiguration.php
index 719c4be..f92cc0e 100644
--- a/code/services/SAMLConfiguration.php
+++ b/code/services/SAMLConfiguration.php
@@ -10,7 +10,7 @@
  *
  * https://syncplicity.zendesk.com/hc/en-us/articles/202392814-Single-sign-on-with-ADFS
  */
-class SAMLConfiguration extends Object
+class SAMLConfiguration extends SS_Object
 {
     /**
      * @var bool
diff --git a/composer.json b/composer.json
index 992d9bf..7879d71 100644
--- a/composer.json
+++ b/composer.json
@@ -16,12 +16,12 @@
     ],
     "require": {
         "php": ">=5.4",
-        "silverstripe/framework": "~3.1",
+        "silverstripe/framework": "^3.7",
         "symbiote/silverstripe-queuedjobs": "^3",
         "zendframework/zend-ldap": "^2.5.1",
         "zendframework/zend-authentication": "^2.5.1",
         "zendframework/zend-session": "^2.5.1",
-        "onelogin/php-saml": "^2.10.7"
+        "onelogin/php-saml": "^3"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8"