From fa7a23a6d26feecd8fa195017a9fbbdf9afcb3a8 Mon Sep 17 00:00:00 2001
From: Brett Tasker <brett@silverstripe.com>
Date: Wed, 26 Apr 2017 23:24:51 +1200
Subject: [PATCH] SS 4.0 - Upgrade Combinations array and Logging

---
 code/utils/CombinationsArrayIterator.php   | 3 +++
 code/utils/logging/MonologFactory.php      | 6 +++++-
 code/utils/logging/QueuedJobLogHandler.php | 6 +++++-
 code/utils/logging/SearchLogFactory.php    | 2 ++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/code/utils/CombinationsArrayIterator.php b/code/utils/CombinationsArrayIterator.php
index 0e873a8..25c0531 100644
--- a/code/utils/CombinationsArrayIterator.php
+++ b/code/utils/CombinationsArrayIterator.php
@@ -1,6 +1,9 @@
 <?php
+
 namespace SilverStripe\FullTextSearch\Utils;
+
 use Iterator;
+
 class CombinationsArrayIterator implements Iterator
 {
     protected $arrays;
diff --git a/code/utils/logging/MonologFactory.php b/code/utils/logging/MonologFactory.php
index bff773f..b8d3eb3 100644
--- a/code/utils/logging/MonologFactory.php
+++ b/code/utils/logging/MonologFactory.php
@@ -1,9 +1,13 @@
 <?php
+
 namespace SilverStripe\FullTextSearch\Utils\Logging;
+
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\HandlerInterface;
 use Monolog\Logger;
+use SilverStripe\Control\Director;
+use SilverStripe\Core\Injector\Injector;
 
 /**
  * Provides logging based on monolog
@@ -97,7 +101,7 @@ class MonologFactory implements SearchLogFactory
     protected function getJobHandler($job)
     {
         return Injector::inst()->createWithArgs(
-            'QueuedJobLogHandler',
+            'SilverStripe\FullTextSearch\Utils\Logging\QueuedJobLogHandler',
             array($job, Logger::INFO)
         );
     }
diff --git a/code/utils/logging/QueuedJobLogHandler.php b/code/utils/logging/QueuedJobLogHandler.php
index 1d4337c..bc54bf0 100644
--- a/code/utils/logging/QueuedJobLogHandler.php
+++ b/code/utils/logging/QueuedJobLogHandler.php
@@ -1,12 +1,16 @@
 <?php
+
 namespace SilverStripe\FullTextSearch\Utils\Logging;
+
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Logger;
 
-if (!interface_exists('QueuedJob')) {
+if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
     return;
 }
 
+use SilverStripe\QueuedJobs\Services\QueuedJob;
+
 /**
  * Handler for logging events into QueuedJob message data
  */
diff --git a/code/utils/logging/SearchLogFactory.php b/code/utils/logging/SearchLogFactory.php
index e9a7b61..230ee62 100644
--- a/code/utils/logging/SearchLogFactory.php
+++ b/code/utils/logging/SearchLogFactory.php
@@ -1,5 +1,7 @@
 <?php
+
 namespace SilverStripe\FullTextSearch\Utils\Logging;
+
 use Psr\Log;
 
 interface SearchLogFactory