From 6fb5736ef328810a46414563ac4ade34177ab2d6 Mon Sep 17 00:00:00 2001
From: Brett Tasker <brett@silverstripe.com>
Date: Wed, 26 Apr 2017 23:23:37 +1200
Subject: [PATCH] SS 4.0 - Upgrade Solr services and stores

---
 code/solr/services/Solr3Service.php         | 2 +-
 code/solr/services/Solr4Service.php         | 2 +-
 code/solr/services/SolrService.php          | 2 +-
 code/solr/stores/SolrConfigStore_File.php   | 2 +-
 code/solr/stores/SolrConfigStore_WebDAV.php | 3 +++
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/solr/services/Solr3Service.php b/code/solr/services/Solr3Service.php
index f2546a6..6afac4d 100644
--- a/code/solr/services/Solr3Service.php
+++ b/code/solr/services/Solr3Service.php
@@ -3,5 +3,5 @@ namespace SilverStripe\FullTextSearch\Solr\Services;
 
 class Solr3Service extends SolrService
 {
-    private static $core_class = 'Solr3Service_Core';
+    private static $core_class = 'SilverStripe\FullTextSearch\Solr\Services\Solr3Service_Core';
 }
diff --git a/code/solr/services/Solr4Service.php b/code/solr/services/Solr4Service.php
index ea69e77..578517b 100644
--- a/code/solr/services/Solr4Service.php
+++ b/code/solr/services/Solr4Service.php
@@ -3,5 +3,5 @@ namespace SilverStripe\FullTextSearch\Solr\Services;
 
 class Solr4Service extends SolrService
 {
-    private static $core_class = 'Solr4Service_Core';
+    private static $core_class = 'SilverStripe\FullTextSearch\Solr\Services\Solr4Service_Core';
 }
diff --git a/code/solr/services/SolrService.php b/code/solr/services/SolrService.php
index 6aae39b..2786605 100644
--- a/code/solr/services/SolrService.php
+++ b/code/solr/services/SolrService.php
@@ -10,7 +10,7 @@ Solr::include_client_api();
  */
 class SolrService extends SolrService_Core
 {
-    private static $core_class = 'SolrService_Core';
+    private static $core_class = 'SilverStripe\FullTextSearch\Solr\Services\SolrService_Core';
 
     /**
      * Handle encoding the GET parameters and making the HTTP call to execute a core command
diff --git a/code/solr/stores/SolrConfigStore_File.php b/code/solr/stores/SolrConfigStore_File.php
index 013020a..c221826 100644
--- a/code/solr/stores/SolrConfigStore_File.php
+++ b/code/solr/stores/SolrConfigStore_File.php
@@ -25,7 +25,7 @@ class SolrConfigStore_File implements SolrConfigStore
             $worked = @mkdir($targetDir, 0770, true);
 
             if (!$worked) {
-                throw new RuntimeException(
+                throw new \RuntimeException(
                     sprintf('Failed creating target directory %s, please check permissions', $targetDir)
                 );
             }
diff --git a/code/solr/stores/SolrConfigStore_WebDAV.php b/code/solr/stores/SolrConfigStore_WebDAV.php
index 96259cb..05451f4 100644
--- a/code/solr/stores/SolrConfigStore_WebDAV.php
+++ b/code/solr/stores/SolrConfigStore_WebDAV.php
@@ -2,6 +2,9 @@
 
 namespace SilverStripe\FullTextSearch\Solr\Stores;
 
+use SilverStripe\FullTextSearch\Utils\WebDAV;
+use SilverStripe\FullTextSearch\Solr\Solr;
+
 /**
  * Class SolrConfigStore_WebDAV
  *