From 377a8cdc7cdb1168fbe9c5c53781db6e54273e00 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Sat, 10 Sep 2016 11:39:25 +1200
Subject: [PATCH] API: silverstripe-upgrader run for ss4 compatibility.

---
 _config.php                                   |  2 ++
 code/admin/GridFieldCategorisationConfig.php  |  8 +++--
 code/admin/GridFieldFormAction.php            |  2 ++
 code/admin/GridFieldMergeAction.php           |  6 ++++
 code/compat/pages/BlogHolder.php              |  2 +-
 code/compat/tasks/BlogMigrationTask.php       |  9 +++++-
 code/extensions/BlogCommentExtension.php      |  2 ++
 code/extensions/BlogFilter.php                | 14 +++++++--
 code/extensions/BlogMemberExtension.php       | 10 ++++++-
 code/extensions/BlogPostFilter.php            | 10 ++++++-
 code/extensions/BlogPostNotifications.php     |  2 ++
 code/extensions/URLSegmentExtension.php       |  4 +++
 code/forms/BlogAdminSidebar.php               |  3 ++
 .../forms/gridfield/GridFieldAddByDBField.php | 12 ++++++++
 .../gridfield/GridFieldBlogPostState.php      |  2 ++
 code/model/Blog.php                           | 29 +++++++++++++++----
 code/model/BlogCategory.php                   |  6 ++++
 code/model/BlogPost.php                       | 22 ++++++++++++--
 code/model/BlogTag.php                        |  6 ++++
 code/widgets/BlogArchiveWidget.php            |  6 ++++
 code/widgets/BlogCategoriesWidget.php         |  5 ++++
 code/widgets/BlogRecentPostsWidget.php        |  3 ++
 code/widgets/BlogTagsCloudWidget.php          |  6 ++++
 code/widgets/BlogTagsWidget.php               |  4 +++
 tests/BlogCategoryTest.php                    | 26 ++++++++++-------
 tests/BlogPostFilterTest.php                  | 10 +++++--
 tests/BlogPostNotificationsTest.php           |  2 ++
 tests/BlogPostTest.php                        | 14 +++++----
 tests/BlogTagTest.php                         | 26 ++++++++++-------
 tests/BlogTagsCloudWidgetTest.php             |  4 +++
 tests/BlogTest.php                            | 25 +++++++++++-----
 31 files changed, 230 insertions(+), 52 deletions(-)

diff --git a/_config.php b/_config.php
index d8ae592..4d7fd10 100755
--- a/_config.php
+++ b/_config.php
@@ -1,4 +1,6 @@
 <?php
+use SilverStripe\Control\Director;
+
 
 /**
  * Fetches the name of the current module folder name.
diff --git a/code/admin/GridFieldCategorisationConfig.php b/code/admin/GridFieldCategorisationConfig.php
index e390bff..51f6dd4 100644
--- a/code/admin/GridFieldCategorisationConfig.php
+++ b/code/admin/GridFieldCategorisationConfig.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\Forms\GridField\GridFieldConfig_RecordEditor;
+
 class GridFieldCategorisationConfig extends GridFieldConfig_RecordEditor
 {
     /**
@@ -13,7 +15,7 @@ class GridFieldCategorisationConfig extends GridFieldConfig_RecordEditor
     {
         parent::__construct($itemsPerPage);
 
-        $this->removeComponentsByType('GridFieldAddNewButton');
+        $this->removeComponentsByType('SilverStripe\\Forms\\GridField\\GridFieldAddNewButton');
 
         $this->addComponent(
             new GridFieldAddByDBField('buttons-before-left')
@@ -26,7 +28,7 @@ class GridFieldCategorisationConfig extends GridFieldConfig_RecordEditor
         /**
          * @var GridFieldDataColumns $columns
          */
-        $columns = $this->getComponentByType('GridFieldDataColumns');
+        $columns = $this->getComponentByType('SilverStripe\\Forms\\GridField\\GridFieldDataColumns');
 
         $columns->setFieldFormatting(array(
             'BlogPostsCount' => function ($value, CategorisationObject $item) {
@@ -45,7 +47,7 @@ class GridFieldCategorisationConfig extends GridFieldConfig_RecordEditor
         /**
          * @var GridFieldDataColumns $columns
          */
-        $columns = $this->getComponentByType('GridFieldDataColumns');
+        $columns = $this->getComponentByType('SilverStripe\\Forms\\GridField\\GridFieldDataColumns');
 
         $columns->setDisplayFields(array(
             'Title' => 'Title',
diff --git a/code/admin/GridFieldFormAction.php b/code/admin/GridFieldFormAction.php
index 47d448f..59f4057 100644
--- a/code/admin/GridFieldFormAction.php
+++ b/code/admin/GridFieldFormAction.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\Forms\GridField\GridField_FormAction;
+
 class GridFieldFormAction extends GridField_FormAction
 {
     /**
diff --git a/code/admin/GridFieldMergeAction.php b/code/admin/GridFieldMergeAction.php
index 42efb8d..6333df4 100644
--- a/code/admin/GridFieldMergeAction.php
+++ b/code/admin/GridFieldMergeAction.php
@@ -1,5 +1,11 @@
 <?php
 
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Control\Controller;
+use SilverStripe\Forms\GridField\GridField_ColumnProvider;
+use SilverStripe\Forms\GridField\GridField_ActionProvider;
+
 class GridFieldMergeAction implements GridField_ColumnProvider, GridField_ActionProvider
 {
     /**
diff --git a/code/compat/pages/BlogHolder.php b/code/compat/pages/BlogHolder.php
index 49bc287..ee497ec 100644
--- a/code/compat/pages/BlogHolder.php
+++ b/code/compat/pages/BlogHolder.php
@@ -22,7 +22,7 @@ class BlogHolder extends BlogTree implements MigratableObject
      * @var array
      */
     private static $has_one = array(
-        'Owner' => 'Member',
+        'Owner' => 'SilverStripe\\Security\\Member',
     );
 
     /**
diff --git a/code/compat/tasks/BlogMigrationTask.php b/code/compat/tasks/BlogMigrationTask.php
index 143fb7c..a098b00 100644
--- a/code/compat/tasks/BlogMigrationTask.php
+++ b/code/compat/tasks/BlogMigrationTask.php
@@ -1,5 +1,12 @@
 <?php
 
+use SilverStripe\Core\ClassInfo;
+use SilverStripe\Control\Controller;
+use SilverStripe\ORM\DatabaseAdmin;
+use SilverStripe\ORM\DB;
+use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\Dev\MigrationTask;
+
 class BlogMigrationTask extends MigrationTask
 {
     /**
@@ -49,7 +56,7 @@ class BlogMigrationTask extends MigrationTask
             return;
         }
 
-        if (is_subclass_of($class, 'SiteTree')) {
+        if (is_subclass_of($class, 'SilverStripe\\CMS\\Model\\SiteTree')) {
             $items = SiteTree::get()->filter('ClassName', $class);
         } else {
             $items = $class::get();
diff --git a/code/extensions/BlogCommentExtension.php b/code/extensions/BlogCommentExtension.php
index de4576a..ed031b5 100644
--- a/code/extensions/BlogCommentExtension.php
+++ b/code/extensions/BlogCommentExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\ORM\DataExtension;
+
 /**
  * Adds Blog specific behaviour to Comment.
  */
diff --git a/code/extensions/BlogFilter.php b/code/extensions/BlogFilter.php
index 65dc027..e86e4e5 100644
--- a/code/extensions/BlogFilter.php
+++ b/code/extensions/BlogFilter.php
@@ -1,5 +1,15 @@
 <?php
 
+use SilverStripe\Security\Permission;
+use SilverStripe\ORM\Versioning\Versioned;
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\Core\Convert;
+use SilverStripe\Core\ClassInfo;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\Tab;
+use SilverStripe\Forms\FormTransformation;
+use SilverStripe\Forms\GridField\GridField;
+
 /**
  * This class is responsible for filtering the SiteTree when necessary and also overlaps into
  * filtering only published posts.
@@ -27,7 +37,7 @@ class BlogFilter extends Lumberjack
 
             $dataQuery = $staged->dataQuery()
                 ->innerJoin('BlogPost', sprintf('"BlogPost%s"."ID" = "SiteTree%s"."ID"', $stage, $stage))
-                ->where(sprintf('"PublishDate" < \'%s\'', Convert::raw2sql(SS_Datetime::now())));
+                ->where(sprintf('"PublishDate" < \'%s\'', Convert::raw2sql(DBDatetime::now())));
 
             $staged = $staged->setDataQuery($dataQuery);
         }
@@ -53,7 +63,7 @@ class BlogFilter extends Lumberjack
         if (!$this->shouldFilter() && $this->isBlog() && !Permission::check('VIEW_DRAFT_CONTENT')) {
             $dataQuery = $staged->dataQuery()
                 ->innerJoin('BlogPost', '"BlogPost_Live"."ID" = "SiteTree_Live"."ID"')
-                ->where(sprintf('"PublishDate" < \'%s\'', Convert::raw2sql(SS_Datetime::now())));
+                ->where(sprintf('"PublishDate" < \'%s\'', Convert::raw2sql(DBDatetime::now())));
 
             $staged = $staged->setDataQuery($dataQuery);
         }
diff --git a/code/extensions/BlogMemberExtension.php b/code/extensions/BlogMemberExtension.php
index 1a3f2d7..f329f95 100644
--- a/code/extensions/BlogMemberExtension.php
+++ b/code/extensions/BlogMemberExtension.php
@@ -1,5 +1,13 @@
 <?php
 
+use SilverStripe\View\Parsers\URLSegmentFilter;
+use SilverStripe\Security\Member;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\Tab;
+use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\ORM\DataExtension;
+
 /**
  * This class is responsible for add Blog specific behaviour to Members.
  *
@@ -20,7 +28,7 @@ class BlogMemberExtension extends DataExtension
      * @var array
      */
     private static $has_one = array(
-        'BlogProfileImage' => 'Image',
+        'BlogProfileImage' => 'SilverStripe\\Assets\\Image',
     );
 
     /**
diff --git a/code/extensions/BlogPostFilter.php b/code/extensions/BlogPostFilter.php
index 1795bc8..3a38123 100644
--- a/code/extensions/BlogPostFilter.php
+++ b/code/extensions/BlogPostFilter.php
@@ -1,5 +1,13 @@
 <?php
 
+use SilverStripe\ORM\Versioning\Versioned;
+use SilverStripe\Control\Controller;
+use SilverStripe\Admin\LeftAndMain;
+use SilverStripe\Security\Permission;
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\Core\Convert;
+use SilverStripe\ORM\DataExtension;
+
 /**
  * This is responsible for filtering only published posts to users who do not have permission to
  * view non-published posts.
@@ -23,7 +31,7 @@ class BlogPostFilter extends DataExtension
         }
 
         if ($stage == 'Live' || !Permission::check('VIEW_DRAFT_CONTENT')) {
-            $query->addWhere(sprintf('"PublishDate" < \'%s\'', Convert::raw2sql(SS_Datetime::now())));
+            $query->addWhere(sprintf('"PublishDate" < \'%s\'', Convert::raw2sql(DBDatetime::now())));
         }
     }
 
diff --git a/code/extensions/BlogPostNotifications.php b/code/extensions/BlogPostNotifications.php
index e3d7ca2..f847bff 100644
--- a/code/extensions/BlogPostNotifications.php
+++ b/code/extensions/BlogPostNotifications.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\ORM\DataExtension;
+
 /**
  * Customise blog post to support comment notifications.
  *
diff --git a/code/extensions/URLSegmentExtension.php b/code/extensions/URLSegmentExtension.php
index 2daba19..8cd7ccb 100644
--- a/code/extensions/URLSegmentExtension.php
+++ b/code/extensions/URLSegmentExtension.php
@@ -1,5 +1,9 @@
 <?php
 
+use SilverStripe\View\Parsers\URLSegmentFilter;
+use SilverStripe\ORM\DataList;
+use SilverStripe\ORM\DataExtension;
+
 /**
  * Adds URLSegment functionality to Tags & Categories.
  *
diff --git a/code/forms/BlogAdminSidebar.php b/code/forms/BlogAdminSidebar.php
index 67deac5..96689de 100644
--- a/code/forms/BlogAdminSidebar.php
+++ b/code/forms/BlogAdminSidebar.php
@@ -1,5 +1,8 @@
 <?php
 
+use SilverStripe\Control\Cookie;
+use SilverStripe\Forms\FieldGroup;
+
 class BlogAdminSidebar extends FieldGroup
 {
     /**
diff --git a/code/forms/gridfield/GridFieldAddByDBField.php b/code/forms/gridfield/GridFieldAddByDBField.php
index 8e6323a..6677527 100644
--- a/code/forms/gridfield/GridFieldAddByDBField.php
+++ b/code/forms/gridfield/GridFieldAddByDBField.php
@@ -1,5 +1,17 @@
 <?php
 
+use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Control\Controller;
+use SilverStripe\Security\Security;
+use SilverStripe\View\Requirements;
+use SilverStripe\Core\Convert;
+use SilverStripe\Forms\TextField;
+use SilverStripe\Forms\GridField\GridField_FormAction;
+use SilverStripe\View\ArrayData;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\Forms\GridField\GridField_ActionProvider;
+use SilverStripe\Forms\GridField\GridField_HTMLProvider;
+
 /**
  * Adds a component which allows a user to add a new DataObject by database field.
  *
diff --git a/code/forms/gridfield/GridFieldBlogPostState.php b/code/forms/gridfield/GridFieldBlogPostState.php
index 3d01ce4..18b39d7 100644
--- a/code/forms/gridfield/GridFieldBlogPostState.php
+++ b/code/forms/gridfield/GridFieldBlogPostState.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\View\Requirements;
+
 /**
  * Provides a component to the {@link GridField} which tells the user whether or not a blog post
  * has been published and when.
diff --git a/code/model/Blog.php b/code/model/Blog.php
index 0ce1b08..8f33693 100644
--- a/code/model/Blog.php
+++ b/code/model/Blog.php
@@ -1,5 +1,24 @@
 <?php
 
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Security\Member;
+use SilverStripe\ORM\UnsavedRelationList;
+use SilverStripe\ORM\DataObject;
+use SilverStripe\Forms\NumericField;
+use SilverStripe\Forms\ListboxField;
+use SilverStripe\Security\Permission;
+use SilverStripe\ORM\DB;
+use SilverStripe\Core\Convert;
+use SilverStripe\Control\Controller;
+use SilverStripe\Security\Group;
+use SilverStripe\Security\PermissionProvider;
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\ORM\PaginatedList;
+use SilverStripe\ORM\FieldType\DBField;
+use SilverStripe\Control\RSS\RSSFeed;
+
 /**
  * Blog Holder
  *
@@ -69,9 +88,9 @@ class Blog extends Page implements PermissionProvider
      * @var array
      */
     private static $many_many = array(
-        'Editors' => 'Member',
-        'Writers' => 'Member',
-        'Contributors' => 'Member',
+        'Editors' => 'SilverStripe\\Security\\Member',
+        'Writers' => 'SilverStripe\\Security\\Member',
+        'Contributors' => 'SilverStripe\\Security\\Member',
     );
 
     /**
@@ -228,7 +247,7 @@ class Blog extends Page implements PermissionProvider
     public function RoleOf($member)
     {
         if (is_numeric($member)) {
-            $member = DataObject::get_by_id('Member', $member);
+            $member = DataObject::get_by_id('SilverStripe\\Security\\Member', $member);
         }
 
         if (!$member) {
@@ -779,7 +798,7 @@ class Blog_Controller extends Page_Controller
                 return (int) $year;
             }
         } elseif ($this->request->param('Action') == 'archive') {
-            return SS_Datetime::now()->Year();
+            return DBDatetime::now()->Year();
         }
 
         return null;
diff --git a/code/model/BlogCategory.php b/code/model/BlogCategory.php
index a678e40..9c86275 100644
--- a/code/model/BlogCategory.php
+++ b/code/model/BlogCategory.php
@@ -1,5 +1,11 @@
 <?php
 
+use SilverStripe\Forms\TextField;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Control\Controller;
+use SilverStripe\Security\Permission;
+use SilverStripe\ORM\DataObject;
+
 /**
  * A blog category for generalising blog posts.
  *
diff --git a/code/model/BlogPost.php b/code/model/BlogPost.php
index 7e6ac15..dbe77ad 100644
--- a/code/model/BlogPost.php
+++ b/code/model/BlogPost.php
@@ -1,5 +1,21 @@
 <?php
 
+use SilverStripe\ORM\UnsavedRelationList;
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\UploadField;
+use SilverStripe\Forms\ToggleCompositeField;
+use SilverStripe\Forms\HiddenField;
+use SilverStripe\Forms\ListboxField;
+use SilverStripe\Forms\TextField;
+use SilverStripe\Forms\DatetimeField;
+use SilverStripe\Security\Group;
+use SilverStripe\Security\Member;
+use SilverStripe\Security\Permission;
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\Control\Controller;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\View\ArrayData;
+
 /**
  * An individual blog post.
  *
@@ -37,7 +53,7 @@ class BlogPost extends Page
      * @var array
      */
     private static $has_one = array(
-        'FeaturedImage' => 'Image',
+        'FeaturedImage' => 'SilverStripe\\Assets\\Image',
     );
 
     /**
@@ -46,7 +62,7 @@ class BlogPost extends Page
     private static $many_many = array(
         'Categories' => 'BlogCategory',
         'Tags' => 'BlogTag',
-        'Authors' => 'Member',
+        'Authors' => 'SilverStripe\\Security\\Member',
     );
 
     /**
@@ -419,7 +435,7 @@ class BlogPost extends Page
         $publishDate = $this->dbObject('PublishDate');
 
         if (!$publishDate->getValue()) {
-            $this->PublishDate = SS_Datetime::now()->getValue();
+            $this->PublishDate = DBDatetime::now()->getValue();
             $this->write();
         }
     }
diff --git a/code/model/BlogTag.php b/code/model/BlogTag.php
index 47c9e57..7b1c1c2 100644
--- a/code/model/BlogTag.php
+++ b/code/model/BlogTag.php
@@ -1,5 +1,11 @@
 <?php
 
+use SilverStripe\Forms\TextField;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Control\Controller;
+use SilverStripe\Security\Permission;
+use SilverStripe\ORM\DataObject;
+
 /**
  * A blog tag for keyword descriptions of a blog post.
  *
diff --git a/code/widgets/BlogArchiveWidget.php b/code/widgets/BlogArchiveWidget.php
index 66cdd45..4a71a39 100644
--- a/code/widgets/BlogArchiveWidget.php
+++ b/code/widgets/BlogArchiveWidget.php
@@ -1,5 +1,11 @@
 <?php
 
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\Forms\NumericField;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\Control\Controller;
+use SilverStripe\View\ArrayData;
+
 if (!class_exists('Widget')) {
     return;
 }
diff --git a/code/widgets/BlogCategoriesWidget.php b/code/widgets/BlogCategoriesWidget.php
index 1429dab..77d5301 100644
--- a/code/widgets/BlogCategoriesWidget.php
+++ b/code/widgets/BlogCategoriesWidget.php
@@ -1,5 +1,10 @@
 <?php
 
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\Forms\NumericField;
+use SilverStripe\Core\Convert;
+
 if (!class_exists("Widget")) {
     return;
 }
diff --git a/code/widgets/BlogRecentPostsWidget.php b/code/widgets/BlogRecentPostsWidget.php
index 2456cb4..1af28d0 100644
--- a/code/widgets/BlogRecentPostsWidget.php
+++ b/code/widgets/BlogRecentPostsWidget.php
@@ -1,5 +1,8 @@
 <?php
 
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\Forms\NumericField;
+
 if (!class_exists("Widget")) {
     return;
 }
diff --git a/code/widgets/BlogTagsCloudWidget.php b/code/widgets/BlogTagsCloudWidget.php
index 7f81e3e..d6c372d 100644
--- a/code/widgets/BlogTagsCloudWidget.php
+++ b/code/widgets/BlogTagsCloudWidget.php
@@ -1,5 +1,11 @@
 <?php
 
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\Core\Convert;
+use SilverStripe\ORM\DB;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\ORM\DataObject;
+
 if (!class_exists('Widget')) {
     return;
 }
diff --git a/code/widgets/BlogTagsWidget.php b/code/widgets/BlogTagsWidget.php
index f2b4677..96dc80b 100644
--- a/code/widgets/BlogTagsWidget.php
+++ b/code/widgets/BlogTagsWidget.php
@@ -1,5 +1,9 @@
 <?php
 
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\Forms\NumericField;
+use SilverStripe\Core\Convert;
+
 if (!class_exists("Widget")) {
     return;
 }
diff --git a/tests/BlogCategoryTest.php b/tests/BlogCategoryTest.php
index c29aa95..69c1a8d 100755
--- a/tests/BlogCategoryTest.php
+++ b/tests/BlogCategoryTest.php
@@ -1,5 +1,11 @@
 <?php
 
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\Security\Member;
+use SilverStripe\Control\Controller;
+use SilverStripe\ORM\ValidationException;
+use SilverStripe\Dev\FunctionalTest;
+
 /**
  * @mixin PHPUnit_Framework_TestCase
  */
@@ -17,7 +23,7 @@ class BlogCategoryTest extends FunctionalTest
     {
         parent::setUp();
 
-        SS_Datetime::set_mock_now('2013-10-10 20:00:00');
+        DBDatetime::set_mock_now('2013-10-10 20:00:00');
     }
 
     /**
@@ -25,7 +31,7 @@ class BlogCategoryTest extends FunctionalTest
      */
     public function tearDown()
     {
-        SS_Datetime::clear_mock_now();
+        DBDatetime::clear_mock_now();
 
         parent::tearDown();
     }
@@ -72,9 +78,9 @@ class BlogCategoryTest extends FunctionalTest
     {
         $this->useDraftSite();
 
-        $this->objFromFixture('Member', 'Admin');
+        $this->objFromFixture('SilverStripe\\Security\\Member', 'Admin');
 
-        $editor = $this->objFromFixture('Member', 'Editor');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Editor');
         $category = $this->objFromFixture('BlogCategory', 'SecondCategory');
 
         $this->assertFalse($category->canView($editor), 'Editor should not be able to view category.');
@@ -87,8 +93,8 @@ class BlogCategoryTest extends FunctionalTest
     {
         $this->useDraftSite();
 
-        $admin = $this->objFromFixture('Member', 'Admin');
-        $editor = $this->objFromFixture('Member', 'Editor');
+        $admin = $this->objFromFixture('SilverStripe\\Security\\Member', 'Admin');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Editor');
 
         $category = $this->objFromFixture('BlogCategory', 'FirstCategory');
 
@@ -110,8 +116,8 @@ class BlogCategoryTest extends FunctionalTest
     {
         $this->useDraftSite();
 
-        $admin = $this->objFromFixture('Member', 'Admin');
-        $editor = $this->objFromFixture('Member', 'Editor');
+        $admin = $this->objFromFixture('SilverStripe\\Security\\Member', 'Admin');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Editor');
 
         $category = singleton('BlogCategory');
 
@@ -123,8 +129,8 @@ class BlogCategoryTest extends FunctionalTest
     {
         $this->useDraftSite();
 
-        $admin = $this->objFromFixture('Member', 'Admin');
-        $editor = $this->objFromFixture('Member', 'Editor');
+        $admin = $this->objFromFixture('SilverStripe\\Security\\Member', 'Admin');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Editor');
 
         $category = $this->objFromFixture('BlogCategory', 'FirstCategory');
 
diff --git a/tests/BlogPostFilterTest.php b/tests/BlogPostFilterTest.php
index e878e40..d62f746 100755
--- a/tests/BlogPostFilterTest.php
+++ b/tests/BlogPostFilterTest.php
@@ -1,5 +1,9 @@
 <?php
 
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\Security\Member;
+use SilverStripe\Dev\SapphireTest;
+
 /**
  * @mixin PHPUnit_Framework_TestCase
  */
@@ -14,12 +18,12 @@ class BlogPostFilterTest extends SapphireTest
     {
         parent::setUp();
 
-        SS_Datetime::set_mock_now('2013-10-10 20:00:00');
+        DBDatetime::set_mock_now('2013-10-10 20:00:00');
     }
 
     public function tearDown()
     {
-        SS_Datetime::clear_mock_now();
+        DBDatetime::clear_mock_now();
 
         parent::tearDown();
     }
@@ -39,7 +43,7 @@ class BlogPostFilterTest extends SapphireTest
 
         $this->assertEquals(3, $blog->AllChildren()->Count(), 'Filtered blog posts');
 
-        SS_Datetime::set_mock_now('2020-01-01 00:00:00');
+        DBDatetime::set_mock_now('2020-01-01 00:00:00');
 
         $this->assertEquals(5, $blog->AllChildren()->Count(), 'Unfiltered blog posts');
     }
diff --git a/tests/BlogPostNotificationsTest.php b/tests/BlogPostNotificationsTest.php
index 25f4073..4eb7634 100644
--- a/tests/BlogPostNotificationsTest.php
+++ b/tests/BlogPostNotificationsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\Dev\SapphireTest;
+
 class BlogPostNotificationsTest extends SapphireTest
 {
     /**
diff --git a/tests/BlogPostTest.php b/tests/BlogPostTest.php
index c527604..dabff06 100644
--- a/tests/BlogPostTest.php
+++ b/tests/BlogPostTest.php
@@ -1,5 +1,9 @@
 <?php
 
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\Core\Config\Config;
+use SilverStripe\Dev\SapphireTest;
+
 class BlogPostTest extends SapphireTest
 {
     /**
@@ -20,7 +24,7 @@ class BlogPostTest extends SapphireTest
      */
     public function tearDown()
     {
-        SS_Datetime::clear_mock_now();
+        DBDatetime::clear_mock_now();
         parent::tearDown();
     }
 
@@ -29,9 +33,9 @@ class BlogPostTest extends SapphireTest
      */
     public function testCanView($date, $user, $page, $canView)
     {
-        $userRecord = $this->objFromFixture('Member', $user);
+        $userRecord = $this->objFromFixture('SilverStripe\\Security\\Member', $user);
         $pageRecord = $this->objFromFixture('BlogPost', $page);
-        SS_Datetime::set_mock_now($date);
+        DBDatetime::set_mock_now($date);
         $this->assertEquals($canView, $pageRecord->canView($userRecord));
     }
 
@@ -88,10 +92,10 @@ class BlogPostTest extends SapphireTest
     {
         $blogPost = $this->objFromFixture('BlogPost', 'NullPublishDate');
 
-        $editor = $this->objFromFixture('Member', 'BlogEditor');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'BlogEditor');
         $this->assertTrue($blogPost->canView($editor));
 
-        $visitor = $this->objFromFixture('Member', 'Visitor');
+        $visitor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Visitor');
         $this->assertFalse($blogPost->canView($visitor));
     }
 
diff --git a/tests/BlogTagTest.php b/tests/BlogTagTest.php
index dcf886c..920475e 100755
--- a/tests/BlogTagTest.php
+++ b/tests/BlogTagTest.php
@@ -1,5 +1,11 @@
 <?php
 
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\Security\Member;
+use SilverStripe\Control\Controller;
+use SilverStripe\ORM\ValidationException;
+use SilverStripe\Dev\FunctionalTest;
+
 /**
  * @mixin PHPUnit_Framework_TestCase
  */
@@ -17,7 +23,7 @@ class BlogTagTest extends FunctionalTest
     {
         parent::setUp();
 
-        SS_Datetime::set_mock_now('2013-10-10 20:00:00');
+        DBDatetime::set_mock_now('2013-10-10 20:00:00');
     }
 
     /**
@@ -25,7 +31,7 @@ class BlogTagTest extends FunctionalTest
      */
     public function tearDown()
     {
-        SS_Datetime::clear_mock_now();
+        DBDatetime::clear_mock_now();
 
         parent::tearDown();
     }
@@ -75,8 +81,8 @@ class BlogTagTest extends FunctionalTest
     {
         $this->useDraftSite();
 
-        $admin = $this->objFromFixture('Member', 'Admin');
-        $editor = $this->objFromFixture('Member', 'Editor');
+        $admin = $this->objFromFixture('SilverStripe\\Security\\Member', 'Admin');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Editor');
 
         $tag = $this->objFromFixture('BlogTag', 'FirstTag');
 
@@ -93,8 +99,8 @@ class BlogTagTest extends FunctionalTest
     {
         $this->useDraftSite();
 
-        $admin = $this->objFromFixture('Member', 'Admin');
-        $editor = $this->objFromFixture('Member', 'Editor');
+        $admin = $this->objFromFixture('SilverStripe\\Security\\Member', 'Admin');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Editor');
 
         $tag = $this->objFromFixture('BlogTag', 'FirstTag');
 
@@ -116,8 +122,8 @@ class BlogTagTest extends FunctionalTest
     {
         $this->useDraftSite();
 
-        $admin = $this->objFromFixture('Member', 'Admin');
-        $editor = $this->objFromFixture('Member', 'Editor');
+        $admin = $this->objFromFixture('SilverStripe\\Security\\Member', 'Admin');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Editor');
 
         $tag = singleton('BlogTag');
 
@@ -129,8 +135,8 @@ class BlogTagTest extends FunctionalTest
     {
         $this->useDraftSite();
 
-        $admin = $this->objFromFixture('Member', 'Admin');
-        $editor = $this->objFromFixture('Member', 'Editor');
+        $admin = $this->objFromFixture('SilverStripe\\Security\\Member', 'Admin');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Editor');
 
         $tag = $this->objFromFixture('BlogTag', 'FirstTag');
 
diff --git a/tests/BlogTagsCloudWidgetTest.php b/tests/BlogTagsCloudWidgetTest.php
index d37a2bc..7c56852 100644
--- a/tests/BlogTagsCloudWidgetTest.php
+++ b/tests/BlogTagsCloudWidgetTest.php
@@ -1,5 +1,9 @@
 <?php
 
+use SilverStripe\Control\Director;
+use SilverStripe\Control\Controller;
+use SilverStripe\Dev\SapphireTest;
+
 class BlogTagsCloudWidgetTest extends SapphireTest {
 
     /**
diff --git a/tests/BlogTest.php b/tests/BlogTest.php
index bfe63fb..2eee735 100755
--- a/tests/BlogTest.php
+++ b/tests/BlogTest.php
@@ -1,5 +1,16 @@
 <?php
 
+use SilverStripe\Core\Config\Config;
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\Security\Member;
+use SilverStripe\Control\Controller;
+use SilverStripe\Control\Director;
+use SilverStripe\CMS\Controllers\ContentController;
+use SilverStripe\Control\HTTPRequest;
+use SilverStripe\ORM\DataModel;
+use SilverStripe\ORM\SS_List;
+use SilverStripe\Dev\SapphireTest;
+
 /**
  * @mixin PHPUnit_Framework_TestCase
  */
@@ -18,7 +29,7 @@ class BlogTest extends SapphireTest
         parent::setUp();
 
         Config::nest();
-        SS_Datetime::set_mock_now('2013-10-10 20:00:00');
+        DBDatetime::set_mock_now('2013-10-10 20:00:00');
 
         /**
          * @var Blog $blog
@@ -33,7 +44,7 @@ class BlogTest extends SapphireTest
      */
     public function tearDown()
     {
-        SS_Datetime::clear_mock_now();
+        DBDatetime::clear_mock_now();
         Config::unnest();
 
         parent::tearDown();
@@ -181,22 +192,22 @@ class BlogTest extends SapphireTest
         /**
          * @var Member $editor
          */
-        $editor = $this->objFromFixture('Member', 'BlogEditor');
+        $editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'BlogEditor');
 
         /**
          * @var Member $writer
          */
-        $writer = $this->objFromFixture('Member', 'Writer');
+        $writer = $this->objFromFixture('SilverStripe\\Security\\Member', 'Writer');
 
         /**
          * @var Member $contributor
          */
-        $contributor = $this->objFromFixture('Member', 'Contributor');
+        $contributor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Contributor');
 
         /**
          * @var Member $visitor
          */
-        $visitor = $this->objFromFixture('Member', 'Visitor');
+        $visitor = $this->objFromFixture('SilverStripe\\Security\\Member', 'Visitor');
 
         $this->assertEquals('Editor', $fourthBlog->RoleOf($editor));
         $this->assertEquals('Contributor', $fourthBlog->RoleOf($contributor));
@@ -321,7 +332,7 @@ class BlogTest extends SapphireTest
      */
     protected function requestURL(ContentController $controller, $url)
     {
-        $request = new SS_HTTPRequest('get', $url);
+        $request = new HTTPRequest('get', $url);
         $request->match('$URLSegment//$Action/$ID/$OtherID');
         $request->shift();
         $controller->init();