From cf8f24c9b9214b6096fe262ce23834dfcfe09dad Mon Sep 17 00:00:00 2001
From: Elliot Sawyer <elliotsawyer@catalyst.net.nz>
Date: Wed, 11 Jul 2018 15:19:11 +1200
Subject: [PATCH] Split Service and Service_Core classes into separate files

---
 code/solr/Solr3Service.php      |  5 ----
 code/solr/Solr3Service_Core.php |  4 +++
 code/solr/Solr4Service.php      | 53 ---------------------------------
 code/solr/Solr4Service_Core.php | 52 ++++++++++++++++++++++++++++++++
 code/solr/Solr5Service.php      |  6 ----
 code/solr/Solr5Service_Core.php |  5 ++++
 6 files changed, 61 insertions(+), 64 deletions(-)
 create mode 100644 code/solr/Solr3Service_Core.php
 create mode 100644 code/solr/Solr4Service_Core.php
 create mode 100644 code/solr/Solr5Service_Core.php

diff --git a/code/solr/Solr3Service.php b/code/solr/Solr3Service.php
index 6c3e535..169e731 100644
--- a/code/solr/Solr3Service.php
+++ b/code/solr/Solr3Service.php
@@ -1,9 +1,4 @@
 <?php
-
-class Solr3Service_Core extends SolrService_Core
-{
-}
-
 class Solr3Service extends SolrService
 {
     private static $core_class = 'Solr3Service_Core';
diff --git a/code/solr/Solr3Service_Core.php b/code/solr/Solr3Service_Core.php
new file mode 100644
index 0000000..c7804fc
--- /dev/null
+++ b/code/solr/Solr3Service_Core.php
@@ -0,0 +1,4 @@
+<?php
+class Solr3Service_Core extends SolrService_Core
+{
+}
diff --git a/code/solr/Solr4Service.php b/code/solr/Solr4Service.php
index 2606dde..e33312a 100644
--- a/code/solr/Solr4Service.php
+++ b/code/solr/Solr4Service.php
@@ -1,57 +1,4 @@
 <?php
-
-class Solr4Service_Core extends SolrService_Core
-{
-    /**
-     * Replace underlying commit function to remove waitFlush in 4.0+, since it's been deprecated and 4.4 throws errors
-     * if you pass it
-     */
-    public function commit($expungeDeletes = false, $waitFlush = null, $waitSearcher = true, $timeout = 3600)
-    {
-        if ($waitFlush) {
-            user_error('waitFlush must be false when using Solr 4.0+' . E_USER_ERROR);
-        }
-
-        $expungeValue = $expungeDeletes ? 'true' : 'false';
-        $searcherValue = $waitSearcher ? 'true' : 'false';
-
-        $rawPost = '<commit expungeDeletes="' . $expungeValue . '" waitSearcher="' . $searcherValue . '" />';
-        return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
-    }
-    
-    /**
-     * @inheritdoc	
-     * @see Solr4Service_Core::addDocuments
-     */
-    public function addDocument(Apache_Solr_Document $document, $allowDups = false,
-        $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0
-    ) {
-        return $this->addDocuments(array($document), $allowDups, $overwritePending, $overwriteCommitted, $commitWithin);
-    }
-
-    /**
-     * Solr 4.0 compat http://wiki.apache.org/solr/UpdateXmlMessages#Optional_attributes_for_.22add.22
-     * Remove allowDups, overwritePending and overwriteComitted
-     */
-    public function addDocuments($documents, $allowDups = false, $overwritePending = true,
-        $overwriteCommitted = true, $commitWithin = 0
-    ) {
-        $overwriteVal = $allowDups ? 'false' : 'true';
-        $commitWithin = (int) $commitWithin;
-        $commitWithinString = $commitWithin > 0 ? " commitWithin=\"{$commitWithin}\"" : '';
-
-        $rawPost = "<add overwrite=\"{$overwriteVal}\"{$commitWithinString}>";
-        foreach ($documents as $document) {
-            if ($document instanceof Apache_Solr_Document) {
-                $rawPost .= $this->_documentToXmlFragment($document);
-            }
-        }
-        $rawPost .= '</add>';
-
-        return $this->add($rawPost);
-    }
-}
-
 class Solr4Service extends SolrService
 {
     private static $core_class = 'Solr4Service_Core';
diff --git a/code/solr/Solr4Service_Core.php b/code/solr/Solr4Service_Core.php
new file mode 100644
index 0000000..7b8d002
--- /dev/null
+++ b/code/solr/Solr4Service_Core.php
@@ -0,0 +1,52 @@
+<?php
+class Solr4Service_Core extends SolrService_Core
+{
+    /**
+     * Replace underlying commit function to remove waitFlush in 4.0+, since it's been deprecated and 4.4 throws errors
+     * if you pass it
+     */
+    public function commit($expungeDeletes = false, $waitFlush = null, $waitSearcher = true, $timeout = 3600)
+    {
+        if ($waitFlush) {
+            user_error('waitFlush must be false when using Solr 4.0+' . E_USER_ERROR);
+        }
+
+        $expungeValue = $expungeDeletes ? 'true' : 'false';
+        $searcherValue = $waitSearcher ? 'true' : 'false';
+
+        $rawPost = '<commit expungeDeletes="' . $expungeValue . '" waitSearcher="' . $searcherValue . '" />';
+        return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
+    }
+
+    /**
+     * @inheritdoc
+     * @see Solr4Service_Core::addDocuments
+     */
+    public function addDocument(Apache_Solr_Document $document, $allowDups = false,
+        $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0
+    ) {
+        return $this->addDocuments(array($document), $allowDups, $overwritePending, $overwriteCommitted, $commitWithin);
+    }
+
+    /**
+     * Solr 4.0 compat http://wiki.apache.org/solr/UpdateXmlMessages#Optional_attributes_for_.22add.22
+     * Remove allowDups, overwritePending and overwriteComitted
+     */
+    public function addDocuments($documents, $allowDups = false, $overwritePending = true,
+        $overwriteCommitted = true, $commitWithin = 0
+    ) {
+        $overwriteVal = $allowDups ? 'false' : 'true';
+        $commitWithin = (int) $commitWithin;
+        $commitWithinString = $commitWithin > 0 ? " commitWithin=\"{$commitWithin}\"" : '';
+
+        $rawPost = "<add overwrite=\"{$overwriteVal}\"{$commitWithinString}>";
+        foreach ($documents as $document) {
+            if ($document instanceof Apache_Solr_Document) {
+                $rawPost .= $this->_documentToXmlFragment($document);
+            }
+        }
+        $rawPost .= '</add>';
+
+        return $this->add($rawPost);
+    }
+}
diff --git a/code/solr/Solr5Service.php b/code/solr/Solr5Service.php
index eef5962..00f9927 100644
--- a/code/solr/Solr5Service.php
+++ b/code/solr/Solr5Service.php
@@ -1,10 +1,4 @@
 <?php
-
-class Solr5Service_Core extends Solr4Service_Core
-{
-
-}
-
 class Solr5Service extends Solr4Service
 {
     private static $core_class = 'Solr5Service_Core';
diff --git a/code/solr/Solr5Service_Core.php b/code/solr/Solr5Service_Core.php
new file mode 100644
index 0000000..ea10c6b
--- /dev/null
+++ b/code/solr/Solr5Service_Core.php
@@ -0,0 +1,5 @@
+<?php
+class Solr5Service_Core extends Solr4Service_Core
+{
+
+}