From 2eba06bb222afdfd3bdb2103945f6162c198037a Mon Sep 17 00:00:00 2001
From: Colin Tucker <colin@praxis.net.au>
Date: Tue, 23 May 2017 16:03:50 +1000
Subject: [PATCH] Removed references to SS Object class

---
 src/Tools/ClassTools.php | 7 ++++---
 src/Tools/ImageTools.php | 8 ++++++--
 src/Tools/ViewTools.php  | 6 ++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Tools/ClassTools.php b/src/Tools/ClassTools.php
index b18314b..d51008b 100644
--- a/src/Tools/ClassTools.php
+++ b/src/Tools/ClassTools.php
@@ -19,10 +19,9 @@
 
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Core\ClassInfo;
-use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
+use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Core\Object;
 use SilverStripe\ORM\HiddenClass;
 use ReflectionException;
 
@@ -35,8 +34,10 @@
  * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
  * @link https://github.com/praxisnetau/silverware
  */
-class ClassTools extends Object
+class ClassTools
 {
+    use Injectable;
+    
     /**
      * Answers an array containing the class names of the ancestors of the object.
      *
diff --git a/src/Tools/ImageTools.php b/src/Tools/ImageTools.php
index 1171d7e..29e2bab 100644
--- a/src/Tools/ImageTools.php
+++ b/src/Tools/ImageTools.php
@@ -18,7 +18,8 @@
 namespace SilverWare\Tools;
 
 use SilverStripe\Assets\Image;
-use SilverStripe\Core\Object;
+use SilverStripe\Core\Config\Configurable;
+use SilverStripe\Core\Injector\Injectable;
 
 /**
  * A singleton providing utility functions for use with images.
@@ -29,8 +30,11 @@
  * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
  * @link https://github.com/praxisnetau/silverware
  */
-class ImageTools extends Object
+class ImageTools
 {
+    use Configurable;
+    use Injectable;
+    
     /**
      * Define resize constants.
      */
diff --git a/src/Tools/ViewTools.php b/src/Tools/ViewTools.php
index 12fd29c..ce1bd78 100644
--- a/src/Tools/ViewTools.php
+++ b/src/Tools/ViewTools.php
@@ -19,7 +19,7 @@
 
 use SilverStripe\Control\Director;
 use SilverStripe\Core\Convert;
-use SilverStripe\Core\Object;
+use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\View\Requirements;
 use SilverStripe\View\ViewableData;
 
@@ -32,8 +32,10 @@
  * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
  * @link https://github.com/praxisnetau/silverware
  */
-class ViewTools extends Object
+class ViewTools
 {
+    use Injectable;
+    
     /**
      * Converts the given array of strings into an HTML attribute string.
      *