Fixed incorrect inheritance (wrong base class).

module/VuFind/src/VuFind/Search/SolrAuth/Options.php

@@ -26,7 +26,7 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrAuth;
-use VuFind\Search\Base\Options as BaseOptions;
+use VuFind\Search\Solr\Options as SolrOptions;
 
 /**
  * Solr Authority Search Options
@@ -37,7 +37,7 @@ use VuFind\Search\Base\Options as BaseOptions;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Options extends BaseOptions
+class Options extends SolrOptions
 {
     /**
      * Constructor

module/VuFind/src/VuFind/Search/SolrAuth/Params.php

@@ -26,7 +26,7 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrAuth;
-use VuFind\Search\Base\Params as BaseParams;
+use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * Solr Authority Search Parameters
@@ -37,6 +37,6 @@ use VuFind\Search\Base\Params as BaseParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Params extends BaseParams
+class Params extends SolrParams
 {
 }
\ No newline at end of file

module/VuFind/src/VuFind/Search/SolrAuth/Results.php

@@ -28,7 +28,7 @@
 namespace VuFind\Search\SolrAuth;
 use VuFind\RecordDriver\SolrAuth as SolrAuthRecord,
     VuFind\Search\Base\Params as BaseParams,
-    VuFind\Search\Base\Results as BaseResults;
+    VuFind\Search\Solr\Results as SolrResults;
 
 /**
  * Solr Authority Search Parameters
@@ -39,7 +39,7 @@ use VuFind\RecordDriver\SolrAuth as SolrAuthRecord,
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Results extends BaseResults
+class Results extends SolrResults
 {
     /**
      * Constructor

module/VuFind/src/VuFind/Search/SolrAuthor/Options.php

@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthor;
-use VuFind\Search\Base\Options as BaseOptions;
+use VuFind\Search\Solr\Options as SolrOptions;
 
 /**
  * Author Search Options
@@ -37,7 +37,7 @@ use VuFind\Search\Base\Options as BaseOptions;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Options extends BaseOptions
+class Options extends SolrOptions
 {
     /**
      * Constructor

module/VuFind/src/VuFind/Search/SolrAuthor/Params.php

@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthor;
-use VuFind\Config\Reader as ConfigReader, VuFind\Search\Base\Params as BaseParams;
+use VuFind\Config\Reader as ConfigReader, VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * Author Search Options
@@ -37,7 +37,7 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Search\Base\Params as BaseParam
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Params extends BaseParams
+class Params extends SolrParams
 {
     /**
      * Support method for _initSearch() -- handle basic settings.

module/VuFind/src/VuFind/Search/SolrAuthor/Results.php

@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthor;
-use VuFind\Search\Base\Results as BaseResults;
+use VuFind\Search\Solr\Results as SolrResults;
 
 /**
  * Author Search Options
@@ -38,7 +38,7 @@ use VuFind\Search\Base\Results as BaseResults;
  * @link     http://vufind.org   Main Site
  */
 
-class Results extends BaseResults
+class Results extends SolrResults
 {
     /**
      * Constructor

module/VuFind/src/VuFind/Search/SolrAuthorFacets/Options.php

@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthorFacets;
-use VuFind\Search\Base\Options as BaseOptions;
+use VuFind\Search\Solr\Options as SolrOptions;
 
 /**
  * AuthorFacets Search Options
@@ -37,7 +37,7 @@ use VuFind\Search\Base\Options as BaseOptions;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Options extends BaseOptions
+class Options extends SolrOptions
 {
     /**
      * Constructor

module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php

@@ -26,7 +26,7 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthorFacets;
-use VuFind\Search\Base\Params as BaseParams;
+use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * AuthorFacets Search Parameters
@@ -37,7 +37,7 @@ use VuFind\Search\Base\Params as BaseParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Params extends BaseParams
+class Params extends SolrParams
 {
     /**
      * Set parameters based on a search object

module/VuFind/src/VuFind/Search/SolrAuthorFacets/Results.php

@@ -27,7 +27,7 @@
  */
 namespace VuFind\Search\SolrAuthorFacets;
 use VuFind\Connection\Manager as ConnectionManager,
-    VuFind\Search\Base\Results as BaseResults;
+    VuFind\Search\Solr\Results as SolrResults;
 
 /**
  * AuthorFacets Search Results
@@ -38,7 +38,7 @@ use VuFind\Connection\Manager as ConnectionManager,
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Results extends BaseResults
+class Results extends SolrResults
 {
     /**
      * Support method for performAndProcessSearch -- perform a search based on the

module/VuFind/src/VuFind/Search/SolrReserves/Options.php

@@ -27,7 +27,7 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrAuth;
-use VuFind\Search\Base\Options as BaseOptions;
+use VuFind\Search\Solr\Options as SolrOptions;
 
 /**
  * Solr Reserves Search Options
@@ -39,7 +39,7 @@ use VuFind\Search\Base\Options as BaseOptions;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Options extends BaseOptions
+class Options extends SolrOptions
 {
     /**
      * Constructor

module/VuFind/src/VuFind/Search/SolrReserves/Params.php

@@ -27,7 +27,7 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrReserves;
-use VuFind\Search\Base\Params as BaseParams;
+use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * Solr Reserves Search Parameters
@@ -39,6 +39,6 @@ use VuFind\Search\Base\Params as BaseParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Params extends BaseParams
+class Params extends SolrParams
 {
 }
\ No newline at end of file

module/VuFind/src/VuFind/Search/SolrReserves/Results.php

@@ -29,7 +29,7 @@
 namespace VuFind\Search\SolrReserves;
 use VuFind\RecordDriver\SolrReserves as SolrReservesRecord,
     VuFind\Search\Base\Params as BaseParams,
-    VuFind\Search\Base\Results as BaseResults;
+    VuFind\Search\Solr\Results as SolrResults;
 
 /**
  * Solr Reserves Search Parameters
@@ -41,7 +41,7 @@ use VuFind\RecordDriver\SolrReserves as SolrReservesRecord,
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Results extends BaseResults
+class Results extends SolrResults
 {
     /**
      * Constructor