From 385943c62b4687955d127e9128fe2fad4f7cb626 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 3 Jul 2012 11:23:16 -0400
Subject: [PATCH] Fixed incorrect inheritance (wrong base class).
---
module/VuFind/src/VuFind/Search/SolrAuth/Options.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrAuth/Params.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrAuth/Results.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrAuthor/Options.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrAuthor/Params.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrAuthor/Results.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrAuthorFacets/Options.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrAuthorFacets/Results.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrReserves/Options.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrReserves/Params.php | 4 ++--
module/VuFind/src/VuFind/Search/SolrReserves/Results.php | 4 ++--
12 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/module/VuFind/src/VuFind/Search/SolrAuth/Options.php b/module/VuFind/src/VuFind/Search/SolrAuth/Options.php
index 52172b67266..6b6e34154f0 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuth/Options.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrAuth/Params.php b/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
index 7636963a965..cae5e038415 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrAuth/Results.php b/module/VuFind/src/VuFind/Search/SolrAuth/Results.php
index bb22442ddab..755eff52ade 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuth/Results.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthor/Options.php b/module/VuFind/src/VuFind/Search/SolrAuthor/Options.php
index 24b73259524..3e5646fb8ae 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthor/Options.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php b/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
index e39ea6d428f..29b76fb0e7c 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
+++ b/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.
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthor/Results.php b/module/VuFind/src/VuFind/Search/SolrAuthor/Results.php
index 9f636a6e9bb..937812610b9 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthor/Results.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Options.php b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Options.php
index 4c4dadd827e..a123ecf704f 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Options.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
index 8fe91fcc77f..b759e95e88e 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Results.php b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Results.php
index 8a9e0b72eb8..96213845d25 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Results.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrReserves/Options.php b/module/VuFind/src/VuFind/Search/SolrReserves/Options.php
index 68b5f4641d3..74450d5bd2f 100644
--- a/module/VuFind/src/VuFind/Search/SolrReserves/Options.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrReserves/Params.php b/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
index ee802f670b4..800844c181e 100644
--- a/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
+++ b/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
diff --git a/module/VuFind/src/VuFind/Search/SolrReserves/Results.php b/module/VuFind/src/VuFind/Search/SolrReserves/Results.php
index 71ce186c2ad..f197deffd49 100644
--- a/module/VuFind/src/VuFind/Search/SolrReserves/Results.php
+++ b/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
--
GitLab