diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index aeaf833b0f45317acd67cc7b8ee5f3b6fa25f5c5..2eef46ed78631f6d6e9d2502a3233c749cec74d8 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -333,10 +333,10 @@ $config = [
'VuFind\Search\BackendManager' => 'VuFind\Search\BackendManagerFactory',
'VuFind\Search\History' => 'VuFind\Service\Factory::getSearchHistory',
'VuFind\Search\Memory' => 'VuFind\Service\Factory::getSearchMemory',
+ 'VuFind\Search\Options\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
+ 'VuFind\Search\Params\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
+ 'VuFind\Search\Results\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
'VuFind\Search\Solr\HierarchicalFacetHelper' => 'Zend\ServiceManager\Factory\InvokableFactory',
- 'VuFind\SearchOptionsPluginManager' => 'VuFind\Service\Factory::getSearchOptionsPluginManager',
- 'VuFind\SearchParamsPluginManager' => 'VuFind\Service\Factory::getSearchParamsPluginManager',
- 'VuFind\SearchResultsPluginManager' => 'VuFind\Service\Factory::getSearchResultsPluginManager',
'VuFind\SearchRunner' => 'VuFind\Service\Factory::getSearchRunner',
'VuFind\SearchSpecsReader' => 'VuFind\Service\Factory::getSearchSpecsReader',
'VuFind\SearchTabsHelper' => 'VuFind\Service\Factory::getSearchTabsHelper',
@@ -392,6 +392,9 @@ $config = [
'VuFind\RecordTabPluginManager' => 'VuFind\RecordTab\PluginManager',
'VuFind\RelatedPluginManager' => 'VuFind\Related\PluginManager',
'VuFind\ResolverDriverPluginManager' => 'VuFind\Resolver\Driver\PluginManager',
+ 'VuFind\SearchOptionsPluginManager' => 'VuFind\Search\Options\PluginManager',
+ 'VuFind\SearchParamsPluginManager' => 'VuFind\Search\Params\PluginManager',
+ 'VuFind\SearchResultsPluginManager' => 'VuFind\Search\Results\PluginManager',
],
],
'translator' => [],
diff --git a/module/VuFind/src/VuFind/Autocomplete/SolrFactory.php b/module/VuFind/src/VuFind/Autocomplete/SolrFactory.php
index eb7719f2dd2ead51b8b73534f8ebab8e38396cc6..81b94e48b5b354de31981b15bdb0c0f3890096c1 100644
--- a/module/VuFind/src/VuFind/Autocomplete/SolrFactory.php
+++ b/module/VuFind/src/VuFind/Autocomplete/SolrFactory.php
@@ -62,7 +62,7 @@ class SolrFactory implements \Zend\ServiceManager\Factory\FactoryInterface
array $options = null
) {
return new $requestedName(
- $container->get('VuFind\SearchResultsPluginManager')
+ $container->get('VuFind\Search\Results\PluginManager')
);
}
}
diff --git a/module/VuFind/src/VuFind/Autocomplete/SuggesterFactory.php b/module/VuFind/src/VuFind/Autocomplete/SuggesterFactory.php
index bf1ee9040b83492a6ed4fe19f33160aa021ddd23..bd27a535da8e8bac4c4f24e8a6e33829fe5b732a 100644
--- a/module/VuFind/src/VuFind/Autocomplete/SuggesterFactory.php
+++ b/module/VuFind/src/VuFind/Autocomplete/SuggesterFactory.php
@@ -62,7 +62,7 @@ class SuggesterFactory implements \Zend\ServiceManager\Factory\FactoryInterface
return new $requestedName(
$container->get('VuFind\Autocomplete\PluginManager'),
$container->get('VuFind\Config\PluginManager'),
- $container->get('VuFind\SearchOptionsPluginManager')
+ $container->get('VuFind\Search\Options\PluginManager')
);
}
}
diff --git a/module/VuFind/src/VuFind/ChannelProvider/Factory.php b/module/VuFind/src/VuFind/ChannelProvider/Factory.php
index 5353a1ab389ba486d1f43c05e2cf03d373e7ec4c..05f235bd1a9ee8c566bf46d57b239ca44766738a 100644
--- a/module/VuFind/src/VuFind/ChannelProvider/Factory.php
+++ b/module/VuFind/src/VuFind/ChannelProvider/Factory.php
@@ -74,7 +74,7 @@ class Factory
public static function getFacets(ServiceManager $sm)
{
$helper = new Facets(
- $sm->get('VuFind\SearchResultsPluginManager'),
+ $sm->get('VuFind\Search\Results\PluginManager'),
$sm->get('ControllerPluginManager')->get('url')
);
$helper->setCoverRouter(
@@ -95,7 +95,7 @@ class Factory
$helper = new ListItems(
$sm->get('VuFind\Db\Table\PluginManager')->get('UserList'),
$sm->get('ControllerPluginManager')->get('url'),
- $sm->get('VuFind\SearchResultsPluginManager')
+ $sm->get('VuFind\Search\Results\PluginManager')
);
$helper->setCoverRouter(
$sm->get('VuFind\Cover\Router')
@@ -114,7 +114,7 @@ class Factory
{
$helper = new Random(
$sm->get('VuFind\Search'),
- $sm->get('VuFind\SearchParamsPluginManager')
+ $sm->get('VuFind\Search\Params\PluginManager')
);
$helper->setCoverRouter(
$sm->get('VuFind\Cover\Router')
diff --git a/module/VuFind/src/VuFind/Controller/AbstractSearch.php b/module/VuFind/src/VuFind/Controller/AbstractSearch.php
index dc202eceeade5f8a0389c292948cad794fb548f3..527546fa365866a2660201e7601f367b787e877d 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractSearch.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractSearch.php
@@ -86,7 +86,7 @@ class AbstractSearch extends AbstractBase
{
$view = $this->createViewModel();
$view->options = $this->serviceLocator
- ->get('VuFind\SearchOptionsPluginManager')->get($this->searchClassId);
+ ->get('VuFind\Search\Options\PluginManager')->get($this->searchClassId);
if ($view->options->getAdvancedSearchAction() === false) {
throw new \Exception('Advanced search not supported.');
}
@@ -102,7 +102,7 @@ class AbstractSearch extends AbstractBase
// to properly populate special controls on the advanced screen.
if (!$view->saved && count($view->options->getDefaultFilters()) > 0) {
$view->saved = $this->serviceLocator
- ->get('VuFind\SearchResultsPluginManager')
+ ->get('VuFind\Search\Results\PluginManager')
->get($this->searchClassId);
$view->saved->getParams()->initFromRequest(
new \Zend\StdLib\Parameters([])
@@ -435,7 +435,7 @@ class AbstractSearch extends AbstractBase
*/
protected function getResultsManager()
{
- return $this->serviceLocator->get('VuFind\SearchResultsPluginManager');
+ return $this->serviceLocator->get('VuFind\Search\Results\PluginManager');
}
/**
diff --git a/module/VuFind/src/VuFind/Controller/AjaxController.php b/module/VuFind/src/VuFind/Controller/AjaxController.php
index fd97e89eb5e89f489ca6cd639dfcb45dae4f4326..9a0b725042f61590d7b27b3bbbf6ef2b9e505142 100644
--- a/module/VuFind/src/VuFind/Controller/AjaxController.php
+++ b/module/VuFind/src/VuFind/Controller/AjaxController.php
@@ -1453,7 +1453,7 @@ class AjaxController extends AbstractBase
*/
protected function getResultsManager()
{
- return $this->serviceLocator->get('VuFind\SearchResultsPluginManager');
+ return $this->serviceLocator->get('VuFind\Search\Results\PluginManager');
}
/**
diff --git a/module/VuFind/src/VuFind/Controller/BrowseController.php b/module/VuFind/src/VuFind/Controller/BrowseController.php
index 18a62b4c70ae9ea26a02126b1d31e2d6cfba136d..ecbddf5765441f1fc15f606237683fbcf24ba5d7 100644
--- a/module/VuFind/src/VuFind/Controller/BrowseController.php
+++ b/module/VuFind/src/VuFind/Controller/BrowseController.php
@@ -596,7 +596,7 @@ class BrowseController extends AbstractBase
$sort = 'count', $query = '[* TO *]'
) {
$results = $this->serviceLocator
- ->get('VuFind\SearchResultsPluginManager')->get('Solr');
+ ->get('VuFind\Search\Results\PluginManager')->get('Solr');
$params = $results->getParams();
$params->addFacet($facet);
if ($category != null) {
diff --git a/module/VuFind/src/VuFind/Controller/CollectionsController.php b/module/VuFind/src/VuFind/Controller/CollectionsController.php
index c0335907a128b99ccdc086ded1814030f2ef6e00..f294966d4553fb719b46281a98e8a40f76f7dfb1 100644
--- a/module/VuFind/src/VuFind/Controller/CollectionsController.php
+++ b/module/VuFind/src/VuFind/Controller/CollectionsController.php
@@ -174,7 +174,7 @@ class CollectionsController extends AbstractBase
$browseField = "hierarchy_browse";
$searchObject = $this->serviceLocator
- ->get('VuFind\SearchResultsPluginManager')->get('Solr');
+ ->get('VuFind\Search\Results\PluginManager')->get('Solr');
foreach ($appliedFilters as $filter) {
$searchObject->getParams()->addFilter($filter);
}
diff --git a/module/VuFind/src/VuFind/Controller/CombinedController.php b/module/VuFind/src/VuFind/Controller/CombinedController.php
index bf1ef1aace93c367b4794d3f81326d40f616aaa9..5fe6e64ca598ddd523cc0294c6fd521d5fab0db2 100644
--- a/module/VuFind/src/VuFind/Controller/CombinedController.php
+++ b/module/VuFind/src/VuFind/Controller/CombinedController.php
@@ -85,7 +85,7 @@ class CombinedController extends AbstractSearch
// Retrieve results:
$options = $this->serviceLocator
- ->get('VuFind\SearchOptionsPluginManager');
+ ->get('VuFind\Search\Options\PluginManager');
$currentOptions = $options->get($searchClassId);
list($controller, $action)
= explode('-', $currentOptions->getSearchAction());
@@ -153,7 +153,7 @@ class CombinedController extends AbstractSearch
// Gather combined results:
$combinedResults = [];
$options = $this->serviceLocator
- ->get('VuFind\SearchOptionsPluginManager');
+ ->get('VuFind\Search\Options\PluginManager');
$config = $this->serviceLocator->get('VuFind\Config\PluginManager')
->get('combined')->toArray();
$supportsCart = false;
@@ -244,7 +244,7 @@ class CombinedController extends AbstractSearch
unset($params['activeSearchClassId']); // don't need to pass this forward
$route = $this->serviceLocator
- ->get('VuFind\SearchOptionsPluginManager')
+ ->get('VuFind\Search\Options\PluginManager')
->get($searchClassId)->getSearchAction();
$base = $this->url()->fromRoute($route);
return $this->redirect()->toUrl($base . '?' . http_build_query($params));
diff --git a/module/VuFind/src/VuFind/Controller/HierarchyController.php b/module/VuFind/src/VuFind/Controller/HierarchyController.php
index 3ed8b0dd7fbebaeae08d60bc02bea73f93ba46d9..3f35d9eeb48f8419636a1c1c161cedf2119d5523 100644
--- a/module/VuFind/src/VuFind/Controller/HierarchyController.php
+++ b/module/VuFind/src/VuFind/Controller/HierarchyController.php
@@ -90,7 +90,7 @@ class HierarchyController extends AbstractBase
$searchType = $this->params()->fromQuery('type', 'AllFields');
$results = $this->serviceLocator
- ->get('VuFind\SearchResultsPluginManager')->get('Solr');
+ ->get('VuFind\Search\Results\PluginManager')->get('Solr');
$results->getParams()->setBasicSearch($lookfor, $searchType);
$results->getParams()->addFilter('hierarchy_top_id:' . $hierarchyID);
$facets = $results->getFullFieldFacets(['id'], false, $limit + 1);
diff --git a/module/VuFind/src/VuFind/Controller/OaiController.php b/module/VuFind/src/VuFind/Controller/OaiController.php
index 07a8e7f98d40c1e31749df1a599ce61be69f3bb7..e32d430a06702ad29c328a6dda668d9e3aafd093 100644
--- a/module/VuFind/src/VuFind/Controller/OaiController.php
+++ b/module/VuFind/src/VuFind/Controller/OaiController.php
@@ -100,7 +100,7 @@ class OaiController extends AbstractBase
$this->getRequest()->getPost()->toArray()
);
$server = new $serverClass(
- $this->serviceLocator->get('VuFind\SearchResultsPluginManager'),
+ $this->serviceLocator->get('VuFind\Search\Results\PluginManager'),
$this->serviceLocator->get('VuFind\RecordLoader'),
$this->serviceLocator->get('VuFind\Db\Table\PluginManager'),
$config, $baseURL, $params
diff --git a/module/VuFind/src/VuFind/Controller/Plugin/Factory.php b/module/VuFind/src/VuFind/Controller/Plugin/Factory.php
index 9a5cf78d40c2e1dd5b8a21648de0b332f1e8dd10..16cbac7117c1b995a8cfc321f7318194d8b54c16 100644
--- a/module/VuFind/src/VuFind/Controller/Plugin/Factory.php
+++ b/module/VuFind/src/VuFind/Controller/Plugin/Factory.php
@@ -195,7 +195,7 @@ class Factory
'ResultScroller',
$sm->get('VuFind\SessionManager')
),
- $sm->get('VuFind\SearchResultsPluginManager')
+ $sm->get('VuFind\Search\Results\PluginManager')
);
}
diff --git a/module/VuFind/src/VuFind/Controller/UpgradeController.php b/module/VuFind/src/VuFind/Controller/UpgradeController.php
index e866bfc504753f9893ee42102de55ffa58863c17..cb23f38c020d35ddee76874cb8e2233e3a91c934 100644
--- a/module/VuFind/src/VuFind/Controller/UpgradeController.php
+++ b/module/VuFind/src/VuFind/Controller/UpgradeController.php
@@ -302,7 +302,7 @@ class UpgradeController extends AbstractBase
protected function fixSearchChecksumsInDatabase()
{
$manager = $this->serviceLocator
- ->get('VuFind\SearchResultsPluginManager');
+ ->get('VuFind\Search\Results\PluginManager');
$search = $this->getTable('search');
$searchWhere = ['checksum' => null, 'saved' => 1];
$searchRows = $search->select($searchWhere);
diff --git a/module/VuFind/src/VuFind/Recommend/Factory.php b/module/VuFind/src/VuFind/Recommend/Factory.php
index b8416c582f7c9b185a14724ee275f0c82d4a4ca8..ae82412e852461f9c81162b6367dfbaa6453c3b0 100644
--- a/module/VuFind/src/VuFind/Recommend/Factory.php
+++ b/module/VuFind/src/VuFind/Recommend/Factory.php
@@ -52,7 +52,7 @@ class Factory
public static function getAuthorFacets(ServiceManager $sm)
{
return new AuthorFacets(
- $sm->get('VuFind\SearchResultsPluginManager')
+ $sm->get('VuFind\Search\Results\PluginManager')
);
}
@@ -67,7 +67,7 @@ class Factory
{
$config = $sm->get('VuFind\Config\PluginManager')->get('config');
return new AuthorInfo(
- $sm->get('VuFind\SearchResultsPluginManager'),
+ $sm->get('VuFind\Search\Results\PluginManager'),
$sm->get('VuFindHttp\HttpService')->createClient(),
isset($config->Content->authors) ? $config->Content->authors : ''
);
@@ -83,7 +83,7 @@ class Factory
public static function getAuthorityRecommend(ServiceManager $sm)
{
return new AuthorityRecommend(
- $sm->get('VuFind\SearchResultsPluginManager')
+ $sm->get('VuFind\Search\Results\PluginManager')
);
}
@@ -161,7 +161,7 @@ class Factory
{
return new ExpandFacets(
$sm->get('VuFind\Config\PluginManager'),
- $sm->get('VuFind\SearchResultsPluginManager')
+ $sm->get('VuFind\Search\Results\PluginManager')
->get('Solr')
);
}
@@ -208,7 +208,7 @@ class Factory
{
return new RandomRecommend(
$sm->get('VuFind\Search'),
- $sm->get('VuFind\SearchParamsPluginManager')
+ $sm->get('VuFind\Search\Params\PluginManager')
);
}
@@ -237,7 +237,7 @@ class Factory
public static function getSummonBestBets(ServiceManager $sm)
{
return new SummonBestBets(
- $sm->get('VuFind\SearchResultsPluginManager')
+ $sm->get('VuFind\Search\Results\PluginManager')
);
}
@@ -251,7 +251,7 @@ class Factory
public static function getSummonDatabases(ServiceManager $sm)
{
return new SummonDatabases(
- $sm->get('VuFind\SearchResultsPluginManager')
+ $sm->get('VuFind\Search\Results\PluginManager')
);
}
@@ -279,7 +279,7 @@ class Factory
public static function getSummonTopics(ServiceManager $sm)
{
return new SummonTopics(
- $sm->get('VuFind\SearchResultsPluginManager')
+ $sm->get('VuFind\Search\Results\PluginManager')
);
}
diff --git a/module/VuFind/src/VuFind/Search/Params/ParamsFactory.php b/module/VuFind/src/VuFind/Search/Params/ParamsFactory.php
index d1722ce72ed5fa90d09b41ae601c3b963828eef6..0c0914bd4211b4513851d57a87cc55f3585e958a 100644
--- a/module/VuFind/src/VuFind/Search/Params/ParamsFactory.php
+++ b/module/VuFind/src/VuFind/Search/Params/ParamsFactory.php
@@ -60,7 +60,7 @@ class ParamsFactory implements FactoryInterface
) {
// Replace trailing "Params" with "Options" to get the options service:
$optionsService = preg_replace('/Params$/', 'Options', $requestedName);
- $optionsObj = $container->get('VuFind\SearchOptionsPluginManager')
+ $optionsObj = $container->get('VuFind\Search\Options\PluginManager')
->get($optionsService);
$configLoader = $container->get('VuFind\Config\PluginManager');
// Clone the options instance in case caller modifies it:
diff --git a/module/VuFind/src/VuFind/Search/Params/PluginFactory.php b/module/VuFind/src/VuFind/Search/Params/PluginFactory.php
index baf5543b435a26dbc4073265f8fe1eeabcdd3be7..5c2696697d4578585f5c6968923d723de2787e4a 100644
--- a/module/VuFind/src/VuFind/Search/Params/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Search/Params/PluginFactory.php
@@ -64,7 +64,7 @@ class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
array $extras = null
) {
$optionsService = preg_replace('/Params$/', 'Options', $requestedName);
- $options = $container->get('VuFind\SearchOptionsPluginManager')
+ $options = $container->get('VuFind\Search\Options\PluginManager')
->get($optionsService);
$class = $this->getClassName($requestedName);
$configLoader = $container->get('VuFind\Config\PluginManager');
diff --git a/module/VuFind/src/VuFind/Search/Results/PluginFactory.php b/module/VuFind/src/VuFind/Search/Results/PluginFactory.php
index 28502272a7ff88562dc30ed98c2e4fd5e038c785..e3e9e470ca0264aa778251e336f22bb5d0f48398 100644
--- a/module/VuFind/src/VuFind/Search/Results/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Search/Results/PluginFactory.php
@@ -64,7 +64,7 @@ class PluginFactory extends \VuFind\ServiceManager\AbstractPluginFactory
array $extras = null
) {
$paramsService = preg_replace('/Results$/', 'Params', $requestedName);
- $params = $container->get('VuFind\SearchParamsPluginManager')
+ $params = $container->get('VuFind\Search\Params\PluginManager')
->get($paramsService);
$searchService = $container->get('VuFind\Search');
$recordLoader = $container->get('VuFind\RecordLoader');
diff --git a/module/VuFind/src/VuFind/Search/Results/ResultsFactory.php b/module/VuFind/src/VuFind/Search/Results/ResultsFactory.php
index 75966bdb4ecc12e21302d9936451815f763f3673..b58b2a7e3d7e34cc873b81813b5e25a5f9157790 100644
--- a/module/VuFind/src/VuFind/Search/Results/ResultsFactory.php
+++ b/module/VuFind/src/VuFind/Search/Results/ResultsFactory.php
@@ -60,7 +60,7 @@ class ResultsFactory implements FactoryInterface
) {
// Replace trailing "Results" with "Params" to get the params service:
$paramsService = preg_replace('/Results$/', 'Params', $requestedName);
- $params = $container->get('VuFind\SearchParamsPluginManager')
+ $params = $container->get('VuFind\Search\Params\PluginManager')
->get($paramsService);
$searchService = $container->get('VuFind\Search');
$recordLoader = $container->get('VuFind\RecordLoader');
diff --git a/module/VuFind/src/VuFind/Service/Factory.php b/module/VuFind/src/VuFind/Service/Factory.php
index 7ab0ad18e04779c5d0cb0f7fcaea8c65b88cf112..f43a4aff4f6cc38119ba619ea8a8aa93a512a6a2 100644
--- a/module/VuFind/src/VuFind/Service/Factory.php
+++ b/module/VuFind/src/VuFind/Service/Factory.php
@@ -284,7 +284,7 @@ class Factory
{
$searchTable = $sm->get('VuFind\Db\Table\PluginManager')
->get("Search");
- $resultsManager = $sm->get('VuFind\SearchResultsPluginManager');
+ $resultsManager = $sm->get('VuFind\Search\Results\PluginManager');
$sessionId = $sm->get('VuFind\SessionManager')->getId();
return new \VuFind\Search\History($searchTable, $sessionId, $resultsManager);
}
@@ -303,42 +303,6 @@ class Factory
);
}
- /**
- * Construct the Search\Options Plugin Manager.
- *
- * @param ServiceManager $sm Service manager.
- *
- * @return \VuFind\Search\Options\PluginManager
- */
- public static function getSearchOptionsPluginManager(ServiceManager $sm)
- {
- return static::getGenericPluginManager($sm, 'Search\Options');
- }
-
- /**
- * Construct the Search\Params Plugin Manager.
- *
- * @param ServiceManager $sm Service manager.
- *
- * @return \VuFind\Search\Params\PluginManager
- */
- public static function getSearchParamsPluginManager(ServiceManager $sm)
- {
- return static::getGenericPluginManager($sm, 'Search\Params');
- }
-
- /**
- * Construct the Search\Results Plugin Manager.
- *
- * @param ServiceManager $sm Service manager.
- *
- * @return \VuFind\Search\Results\PluginManager
- */
- public static function getSearchResultsPluginManager(ServiceManager $sm)
- {
- return static::getGenericPluginManager($sm, 'Search\Results');
- }
-
/**
* Construct the Search runner.
*
@@ -349,7 +313,7 @@ class Factory
public static function getSearchRunner(ServiceManager $sm)
{
return new \VuFind\Search\SearchRunner(
- $sm->get('VuFind\SearchResultsPluginManager'),
+ $sm->get('VuFind\Search\Results\PluginManager'),
new \Zend\EventManager\EventManager($sm->get('SharedEventManager'))
);
}
@@ -399,7 +363,7 @@ class Factory
$permissionConfig = isset($config->SearchTabsPermissions)
? $config->SearchTabsPermissions->toArray() : [];
return new \VuFind\Search\SearchTabsHelper(
- $sm->get('VuFind\SearchResultsPluginManager'),
+ $sm->get('VuFind\Search\Results\PluginManager'),
$tabConfig, $filterConfig,
$sm->get('Application')->getRequest(), $permissionConfig
);
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Factory.php b/module/VuFind/src/VuFind/View/Helper/Root/Factory.php
index 3b8680f252ee6e01989098dd316dcf2a63fc6b56..4d3c46f7d330ba77b82d2a0e3c359fb53a45657b 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Factory.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Factory.php
@@ -494,7 +494,7 @@ class Factory
= isset($searchboxConfig['General']['includeAlphaBrowse'])
&& $searchboxConfig['General']['includeAlphaBrowse'];
return new SearchBox(
- $sm->get('VuFind\SearchOptionsPluginManager'),
+ $sm->get('VuFind\Search\Options\PluginManager'),
$searchboxConfig,
isset($mainConfig->SearchPlaceholder)
? $mainConfig->SearchPlaceholder->toArray() : [],
@@ -527,7 +527,7 @@ class Factory
public static function getSearchOptions(ServiceManager $sm)
{
return new SearchOptions(
- $sm->get('VuFind\SearchOptionsPluginManager')
+ $sm->get('VuFind\Search\Options\PluginManager')
);
}
@@ -541,7 +541,7 @@ class Factory
public static function getSearchParams(ServiceManager $sm)
{
return new SearchParams(
- $sm->get('VuFind\SearchParamsPluginManager')
+ $sm->get('VuFind\Search\Params\PluginManager')
);
}
@@ -556,7 +556,7 @@ class Factory
{
$helpers = $sm->get('ViewHelperManager');
return new SearchTabs(
- $sm->get('VuFind\SearchResultsPluginManager'),
+ $sm->get('VuFind\Search\Results\PluginManager'),
$helpers->get('url'), $sm->get('VuFind\SearchTabsHelper')
);
}
diff --git a/module/VuFind/src/VuFindTest/Unit/TestCase.php b/module/VuFind/src/VuFindTest/Unit/TestCase.php
index 508eca3a2bde8488218baef983f1ca6de6328f76..43ec1b7933585c296d9b0290f4387b51612fe6c7 100644
--- a/module/VuFind/src/VuFindTest/Unit/TestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/TestCase.php
@@ -149,7 +149,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
]
);
$this->serviceManager->setService(
- 'VuFind\SearchOptionsPluginManager', $optionsFactory
+ 'VuFind\Search\Options\PluginManager', $optionsFactory
);
$paramsFactory = new \VuFind\Search\Params\PluginManager(
$this->serviceManager,
@@ -159,7 +159,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
]
);
$this->serviceManager->setService(
- 'VuFind\SearchParamsPluginManager', $paramsFactory
+ 'VuFind\Search\Params\PluginManager', $paramsFactory
);
$resultsFactory = new \VuFind\Search\Results\PluginManager(
$this->serviceManager,
@@ -169,7 +169,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
]
);
$this->serviceManager->setService(
- 'VuFind\SearchResultsPluginManager', $resultsFactory
+ 'VuFind\Search\Results\PluginManager', $resultsFactory
);
$recordDriverFactory = new \VuFind\RecordDriver\PluginManager(
$this->serviceManager,
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/View/Helper/Root/ResultFeedTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/View/Helper/Root/ResultFeedTest.php
index 313ce64da8526d34ee30e3a88325cfb1ef5cfa2f..b836da4251817085dfb72bbbfdf294b9cd75a1c8 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/View/Helper/Root/ResultFeedTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/View/Helper/Root/ResultFeedTest.php
@@ -119,7 +119,7 @@ class ResultFeedTest extends \VuFindTest\Unit\ViewHelperTestCase
$request->set('view', 'rss');
$results = $this->getServiceManager()
- ->get('VuFind\SearchResultsPluginManager')->get('Solr');
+ ->get('VuFind\Search\Results\PluginManager')->get('Solr');
$results->getParams()->initFromRequest($request);
$helper = new ResultFeed();
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/RandomRecommendTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/RandomRecommendTest.php
index 27486bcee97bf3da604819091496c2199e00b13c..3d9cafc8e3066937e5b974d1bb5407e35d3625da 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/RandomRecommendTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/RandomRecommendTest.php
@@ -149,8 +149,8 @@ class RandomRecommendTest extends TestCase
$recommend = new Random($service, $paramManager);
// Use Solr since some Base components are abstract:
- $params = $this->getServiceManager()->get('VuFind\SearchParamsPluginManager')
- ->get('Solr');
+ $params = $this->getServiceManager()
+ ->get('VuFind\Search\Params\PluginManager')->get('Solr');
$query = $this->getFixture('query');
$params->setBasicSearch($query->getString(), $query->getHandler());
$request = $this->createMock('\Zend\StdLib\Parameters');
@@ -181,14 +181,14 @@ class RandomRecommendTest extends TestCase
->with($this->equalTo("Solr"))
->will(
$this->returnValue(
- $this->getServiceManager()->get('VuFind\SearchParamsPluginManager')
- ->get('Solr')
+ $this->getServiceManager()
+ ->get('VuFind\Search\Params\PluginManager')->get('Solr')
)
);
// Use Solr since some Base components are abstract:
- $params = $this->getServiceManager()->get('VuFind\SearchParamsPluginManager')
- ->get('Solr');
+ $params = $this->getServiceManager()
+ ->get('VuFind\Search\Params\PluginManager')->get('Solr');
$query = $this->getFixture('query');
$params->setBasicSearch($query->getString(), $query->getHandler());
$request = $this->createMock('\Zend\StdLib\Parameters');
@@ -214,8 +214,8 @@ class RandomRecommendTest extends TestCase
$records = ["1", "2", "3", "4", "5"];
// Use Solr since some Base components are abstract:
- $results = $this->getServiceManager()->get('VuFind\SearchResultsPluginManager')
- ->get('Solr');
+ $results = $this->getServiceManager()
+ ->get('VuFind\Search\Results\PluginManager')->get('Solr');
$params = $results->getParams();
$query = $this->getFixture('query');
$params->setBasicSearch($query->getString(), $query->getHandler());
@@ -252,8 +252,8 @@ class RandomRecommendTest extends TestCase
$records = ["1", "2", "3", "4", "5"];
// Use Solr since some Base components are abstract:
- $results = $this->getServiceManager()->get('VuFind\SearchResultsPluginManager')
- ->get('Solr');
+ $results = $this->getServiceManager()
+ ->get('VuFind\Search\Results\PluginManager')->get('Solr');
$params = $results->getParams();
$query = $this->getFixture('query');
$params->setBasicSearch($query->getString(), $query->getHandler());
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Base/ParamsTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Base/ParamsTest.php
index 727aaa12de5b959b476d0e48b903ad9c538205ec..943b426f3c6072ab49b3d6b7e0cdc67b45106b22 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Base/ParamsTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Base/ParamsTest.php
@@ -49,8 +49,8 @@ class ParamsTest extends \VuFindTest\Unit\TestCase
public function testSpellingReplacements()
{
// Use Solr since some Base components are abstract:
- $params = $this->getServiceManager()->get('VuFind\SearchParamsPluginManager')
- ->get('Solr');
+ $params = $this->getServiceManager()
+ ->get('VuFind\Search\Params\PluginManager')->get('Solr');
// Key test: word boundaries:
$params->setBasicSearch('go good googler');
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php
index a639d2f350b432422084e80e0bf08215e8cc737c..01d71e263feb8be541cbd4026b6f1c23fde5d208 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php
@@ -130,8 +130,8 @@ class SpellingProcessorTest extends TestCase
{
$spelling = $this->getFixture('spell1');
$query = $this->getFixture('query1');
- $params = $this->getServiceManager()->get('VuFind\SearchParamsPluginManager')
- ->get('Solr');
+ $params = $this->getServiceManager()
+ ->get('VuFind\Search\Params\PluginManager')->get('Solr');
$params->setBasicSearch($query->getString(), $query->getHandler());
$sp = new SpellingProcessor();
$this->assertEquals(
@@ -192,8 +192,8 @@ class SpellingProcessorTest extends TestCase
{
$spelling = $this->getFixture('spell1');
$query = $this->getFixture('query1');
- $params = $this->getServiceManager()->get('VuFind\SearchParamsPluginManager')
- ->get('Solr');
+ $params = $this->getServiceManager()
+ ->get('VuFind\Search\Params\PluginManager')->get('Solr');
$params->setBasicSearch($query->getString(), $query->getHandler());
$config = new Config(['expand' => false, 'phrase' => true]);
$sp = new SpellingProcessor($config);
@@ -428,8 +428,8 @@ class SpellingProcessorTest extends TestCase
{
$spelling = $this->getFixture('spell' . $testNum);
$query = $this->getFixture('query' . $testNum);
- $params = $this->getServiceManager()->get('VuFind\SearchParamsPluginManager')
- ->get('Solr');
+ $params = $this->getServiceManager()
+ ->get('VuFind\Search\Params\PluginManager')->get('Solr');
$this->setProperty($params, 'query', $query);
$sp = new SpellingProcessor(new Config($config));
$suggestions = $sp->getSuggestions($spelling, $query);
diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php b/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
index a67d544219d261f6697c800d34ed6101d7c6ffc7..56c2cf7aafd6010b75611a57af3ffe7fa268e6ef 100644
--- a/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
@@ -607,7 +607,7 @@ class UtilController extends AbstractBase
$skipXml = $request->getParam('skip-xml') || $request->getParam('sx');
$recordLoader = $this->serviceLocator->get('VuFind\RecordLoader');
$hierarchies = $this->serviceLocator
- ->get('VuFind\SearchResultsPluginManager')->get('Solr')
+ ->get('VuFind\Search\Results\PluginManager')->get('Solr')
->getFullFieldFacets(['hierarchy_top_id']);
if (!isset($hierarchies['hierarchy_top_id']['data']['list'])) {
$hierarchies['hierarchy_top_id']['data']['list'] = [];
diff --git a/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php b/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php
index a46545b736d922e351fcfcd6d86bb197749f9226..421eab962d70ae94f2e137819ef8d400e23e333a 100644
--- a/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php
+++ b/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php
@@ -78,7 +78,7 @@ class DevtoolsController extends \VuFind\Controller\AbstractBase
}
if (isset($view->min) && $view->min) {
$view->results = $view->min->deminify(
- $this->serviceLocator->get('VuFind\SearchResultsPluginManager')
+ $this->serviceLocator->get('VuFind\Search\Results\PluginManager')
);
}
if (isset($view->results) && $view->results) {