From 51edd8d62050d5559a7a4bb75afd7b6d01896f00 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Wed, 10 Jan 2018 09:08:40 +0000
Subject: [PATCH 1/3] Reorganise imports and class detection for
 WidgetControllers

---
 src/Widgets/BlogArchiveWidgetController.php     | 6 +++---
 src/Widgets/BlogCategoriesWidgetController.php  | 6 +++---
 src/Widgets/BlogRecentPostsWidgetController.php | 6 +++---
 src/Widgets/BlogTagsCloudWidgetController.php   | 6 +++---
 src/Widgets/BlogTagsWidgetController.php        | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Widgets/BlogArchiveWidgetController.php b/src/Widgets/BlogArchiveWidgetController.php
index 5aa1956..cea77c6 100644
--- a/src/Widgets/BlogArchiveWidgetController.php
+++ b/src/Widgets/BlogArchiveWidgetController.php
@@ -2,12 +2,12 @@
 
 namespace SilverStripe\Blog\Widgets;
 
-if (!class_exists('\\SilverStripe\\Widgets\\Model\\Widget')) {
+use SilverStripe\Widgets\Model\WidgetController;
+
+if (!class_exists(WidgetController::class)) {
     return;
 }
 
-use SilverStripe\Widgets\Model\WidgetController;
-
 class BlogArchiveWidgetController extends WidgetController
 {
 
diff --git a/src/Widgets/BlogCategoriesWidgetController.php b/src/Widgets/BlogCategoriesWidgetController.php
index 2c69336..2780e79 100644
--- a/src/Widgets/BlogCategoriesWidgetController.php
+++ b/src/Widgets/BlogCategoriesWidgetController.php
@@ -2,12 +2,12 @@
 
 namespace SilverStripe\Blog\Widgets;
 
-if (!class_exists('\\SilverStripe\\Widgets\\Model\\Widget')) {
+use SilverStripe\Widgets\Model\WidgetController;
+
+if (!class_exists(WidgetController::class)) {
     return;
 }
 
-use SilverStripe\Widgets\Model\WidgetController;
-
 class BlogCategoriesWidgetController extends WidgetController
 {
 
diff --git a/src/Widgets/BlogRecentPostsWidgetController.php b/src/Widgets/BlogRecentPostsWidgetController.php
index c1bea04..a3399ad 100644
--- a/src/Widgets/BlogRecentPostsWidgetController.php
+++ b/src/Widgets/BlogRecentPostsWidgetController.php
@@ -2,12 +2,12 @@
 
 namespace SilverStripe\Blog\Widgets;
 
-if (!class_exists('\\SilverStripe\\Widgets\\Model\\Widget')) {
+use SilverStripe\Widgets\Model\WidgetController;
+
+if (!class_exists(WidgetController::class)) {
     return;
 }
 
-use SilverStripe\Widgets\Model\WidgetController;
-
 class BlogRecentPostsWidgetController extends WidgetController
 {
 
diff --git a/src/Widgets/BlogTagsCloudWidgetController.php b/src/Widgets/BlogTagsCloudWidgetController.php
index a620b9f..1f04d4e 100644
--- a/src/Widgets/BlogTagsCloudWidgetController.php
+++ b/src/Widgets/BlogTagsCloudWidgetController.php
@@ -2,12 +2,12 @@
 
 namespace SilverStripe\Blog\Widgets;
 
-if (!class_exists('\\SilverStripe\\Widgets\\Model\\Widget')) {
+use SilverStripe\Widgets\Model\WidgetController;
+
+if (!class_exists(WidgetController::class)) {
     return;
 }
 
-use SilverStripe\Widgets\Model\WidgetController;
-
 class BlogTagsCloudWidgetController extends WidgetController
 {
 }
diff --git a/src/Widgets/BlogTagsWidgetController.php b/src/Widgets/BlogTagsWidgetController.php
index 413fc84..bd99dfa 100644
--- a/src/Widgets/BlogTagsWidgetController.php
+++ b/src/Widgets/BlogTagsWidgetController.php
@@ -2,12 +2,12 @@
 
 namespace SilverStripe\Blog\Widgets;
 
-if (!class_exists('\\SilverStripe\\Widgets\\Model\\Widget')) {
+use SilverStripe\Widgets\Model\WidgetController;
+
+if (!class_exists(WidgetController::class)) {
     return;
 }
 
-use SilverStripe\Widgets\Model\WidgetController;
-
 class BlogTagsWidgetController extends WidgetController
 {
 

From 0c23c78bfa7706f7f3425adb5685b5d1310568f6 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Wed, 10 Jan 2018 12:25:23 +0000
Subject: [PATCH 2/3] Publish test widget explicitly

---
 tests/Widgets/BlogArchiveWidgetTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Widgets/BlogArchiveWidgetTest.php b/tests/Widgets/BlogArchiveWidgetTest.php
index a6f6fe8..49f2617 100644
--- a/tests/Widgets/BlogArchiveWidgetTest.php
+++ b/tests/Widgets/BlogArchiveWidgetTest.php
@@ -54,6 +54,7 @@ class BlogArchiveWidgetTest extends SapphireTest
         $original = Versioned::get_stage();
 
         $this->objFromFixture(BlogPost::class, 'post-b')->publishRecursive();
+        $this->objFromFixture(BlogArchiveWidget::class, 'archive-monthly')->publishRecursive();
         Versioned::set_stage(Versioned::LIVE);
 
         $widget = $this->objFromFixture(BlogArchiveWidget::class, 'archive-monthly');

From b7510c8a567abb3e2eae2f4034c27030e027908a Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Wed, 10 Jan 2018 12:26:27 +0000
Subject: [PATCH 3/3] Remove use of deprecated assertDOSContains

---
 tests/Widgets/BlogArchiveWidgetTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Widgets/BlogArchiveWidgetTest.php b/tests/Widgets/BlogArchiveWidgetTest.php
index 49f2617..b3d1060 100644
--- a/tests/Widgets/BlogArchiveWidgetTest.php
+++ b/tests/Widgets/BlogArchiveWidgetTest.php
@@ -42,7 +42,7 @@ class BlogArchiveWidgetTest extends SapphireTest
 
         $this->assertInstanceOf(SS_List::class, $archive);
         $this->assertCount(3, $archive);
-        $this->assertDOSContains([
+        $this->assertListContains([
             ['Title' => 'August 2017'],
             ['Title' => 'September 2017'],
             ['Title' => 'May 2015'],
@@ -61,7 +61,7 @@ class BlogArchiveWidgetTest extends SapphireTest
         $archive = $widget->getArchive();
 
         $this->assertCount(1, $archive);
-        $this->assertDOSContains([
+        $this->assertListContains([
             ['Title' => 'August 2017'],
         ], $archive);
 
@@ -77,7 +77,7 @@ class BlogArchiveWidgetTest extends SapphireTest
 
         $this->assertInstanceOf(SS_List::class, $archive);
         $this->assertCount(2, $archive);
-        $this->assertDOSContains([
+        $this->assertListContains([
             ['Title' => '2017'],
             ['Title' => '2015'],
         ], $archive);