From 022575fadb2d7a7ebc46b4b9094ee1b5e91f9e4a Mon Sep 17 00:00:00 2001
From: Brett Tasker <brett@silverstripe.com>
Date: Wed, 26 Apr 2017 23:13:26 +1200
Subject: [PATCH] SS 4.0 - Upgrade FullTextSearch, queries and updaters

---
 code/search/FullTextSearch.php                       | 3 +++
 code/search/queries/SearchQuery.php                  | 8 ++++++--
 code/search/updaters/SearchUpdater.php               | 7 ++-----
 code/search/updaters/SearchUpdater_ObjectHandler.php | 7 +++++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/code/search/FullTextSearch.php b/code/search/FullTextSearch.php
index b419d25..bd32511 100644
--- a/code/search/FullTextSearch.php
+++ b/code/search/FullTextSearch.php
@@ -3,7 +3,10 @@
 namespace SilverStripe\FullTextSearch\Search;
 
 use SilverStripe\Core\Config\Config;
+use SilverStripe\ORM\DataObject;
 use SilverStripe\Core\ClassInfo;
+use ReflectionClass;
+
 /**
  * Base class to manage active search indexes.
  */
diff --git a/code/search/queries/SearchQuery.php b/code/search/queries/SearchQuery.php
index d40fea4..8fe5f88 100644
--- a/code/search/queries/SearchQuery.php
+++ b/code/search/queries/SearchQuery.php
@@ -1,11 +1,15 @@
 <?php
-namespace SilverStripe\FullTextSearch\Search\Indexes;
+
+namespace SilverStripe\FullTextSearch\Search\Queries;
+
+use SilverStripe\View\ViewableData;
+use stdClass;
+
 /**
  * Represents a search query
  *
  * API very much still in flux.
  */
-use SilverStripe\View\ViewableData;
 class SearchQuery extends ViewableData
 {
     public static $missing = null;
diff --git a/code/search/updaters/SearchUpdater.php b/code/search/updaters/SearchUpdater.php
index 9e325c7..5abdc54 100644
--- a/code/search/updaters/SearchUpdater.php
+++ b/code/search/updaters/SearchUpdater.php
@@ -6,6 +6,7 @@ use SilverStripe\ORM\DB;
 use SilverStripe\Core\Object;
 use SilverStripe\FullTextSearch\Search\Variants\SearchVariant;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\Dev\SapphireTest;
 use SilverStripe\FullTextSearch\Search\FullTextSearch;
 use SilverStripe\FullTextSearch\Search\SearchIntrospection;
 use SilverStripe\Core\Injector\Injector;
@@ -173,9 +174,8 @@ class SearchUpdater extends Object
 
         // Don't do it if we're testing - there's no database connection outside the test methods, so we'd
         // just get errors
-        $runningTests = class_exists('SapphireTest', false) && SapphireTest::is_running_test();
 
-        if (self::$processor && !self::$registered && !$runningTests) {
+        if (self::$processor && !self::$registered && !SapphireTest::is_running_test()) {
             register_shutdown_function(array(SearchUpdater::class, "flush_dirty_indexes"));
             self::$registered = true;
         }
@@ -203,6 +203,3 @@ class SearchUpdater extends Object
         self::$processor = null;
     }
 }
-
-
-
diff --git a/code/search/updaters/SearchUpdater_ObjectHandler.php b/code/search/updaters/SearchUpdater_ObjectHandler.php
index da248ba..f469584 100644
--- a/code/search/updaters/SearchUpdater_ObjectHandler.php
+++ b/code/search/updaters/SearchUpdater_ObjectHandler.php
@@ -1,7 +1,10 @@
 <?php
 
 namespace SilverStripe\FullTextSearch\Search\Updaters;
+
 use SilverStripe\ORM\DataExtension;
+use SilverStripe\FullTextSearch\Search\Variants\SearchVariant;
+use SilverStripe\ORM\DataObject;
 
 /**
  * Delete operations do not use database manipulations.
@@ -43,7 +46,7 @@ class SearchUpdater_ObjectHandler extends DataExtension
         $id = $this->owner->ID;
         $class = $this->owner->ClassName;
         $state = SearchVariant::current_state($class);
-        $base = ClassInfo::baseDataClass($class);
+        $base = DataObject::getSchema()->baseDataClass($class);
         $key = "$id:$base:".serialize($state);
 
         $statefulids = array(array(
@@ -63,4 +66,4 @@ class SearchUpdater_ObjectHandler extends DataExtension
 
         SearchUpdater::process_writes($writes);
     }
-}
\ No newline at end of file
+}