diff --git a/module/VuFind/src/VuFind/Recommend/FavoriteFacets.php b/module/VuFind/src/VuFind/Recommend/FavoriteFacets.php index 4b83daa4a85..fcc5dcbeaa8 100644 --- a/module/VuFind/src/VuFind/Recommend/FavoriteFacets.php +++ b/module/VuFind/src/VuFind/Recommend/FavoriteFacets.php @@ -29,8 +29,6 @@ namespace VuFind\Recommend; -use VuFind\Search\Solr\HierarchicalFacetHelper; - /** * FavoriteFacets Recommendations Module * @@ -55,16 +53,13 @@ class FavoriteFacets extends SideFacets * Constructor * * @param \VuFind\Config\PluginManager $configLoader Configuration loader - * @param HierarchicalFacetHelper $facetHelper Helper for handling - * hierarchical facets * @param string $tagSetting Tag capability setting */ public function __construct( \VuFind\Config\PluginManager $configLoader, - HierarchicalFacetHelper $facetHelper = null, $tagSetting = 'enabled' ) { - parent::__construct($configLoader, $facetHelper); + parent::__construct($configLoader); $this->tagSetting = $tagSetting; } diff --git a/module/VuFind/src/VuFind/Recommend/FavoriteFacetsFactory.php b/module/VuFind/src/VuFind/Recommend/FavoriteFacetsFactory.php index f724ce641ba..4e72242fb11 100644 --- a/module/VuFind/src/VuFind/Recommend/FavoriteFacetsFactory.php +++ b/module/VuFind/src/VuFind/Recommend/FavoriteFacetsFactory.php @@ -72,7 +72,6 @@ public function __invoke( $capabilities = $container->get(\VuFind\Config\AccountCapabilities::class); return new $requestedName( $container->get(\VuFind\Config\PluginManager::class), - null, $capabilities->getTagSetting() ); } diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/CollectionSideFacetsTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/CollectionSideFacetsTest.php index c01670afc4d..a81f775a875 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/CollectionSideFacetsTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/CollectionSideFacetsTest.php @@ -62,13 +62,11 @@ public function testKeywordFilter() /** * Get a fully configured module * - * @param \VuFind\Config\PluginManager $configLoader config loader - * @param \VuFind\Search\Solr\Results $results results + * @param \VuFind\Config\PluginManager $configLoader config loader + * @param \VuFind\Search\Solr\Results $results results * object - * @param string $settings settings - * @param \Laminas\Stdlib\Parameters $request request - * @param \VuFind\Search\Solr\HierarchicalFacetHelper $facetHelper hierarchical - * facet helper (true to build default, null to omit) + * @param string $settings settings + * @param \Laminas\Stdlib\Parameters $request request * * @return SideFacets */ @@ -76,13 +74,9 @@ protected function getSideFacets( $configLoader = null, $results = null, $settings = '', - $request = null, - $facetHelper = true + $request = null ) { - $sf = new CollectionSideFacets( - $configLoader ?? $this->getMockConfigPluginManager([]), - $facetHelper ? new \VuFind\Search\Solr\HierarchicalFacetHelper() : false - ); + $sf = new CollectionSideFacets($configLoader ?? $this->getMockConfigPluginManager([])); $sf->setConfig($settings); $sf->init( $results->getParams(), diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/FavoriteFacetsTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/FavoriteFacetsTest.php index 68a9d5bff98..6c587db0de7 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/FavoriteFacetsTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/FavoriteFacetsTest.php @@ -74,13 +74,11 @@ public function testFacetInitWithEnabledTags() /** * Get a fully configured module * - * @param \VuFind\Search\Solr\Results $results results object - * @param string $tagSetting Are tags enabled? - * @param string $settings settings - * @param \Laminas\Stdlib\Parameters $request request - * @param \VuFind\Search\Solr\HierarchicalFacetHelper $facetHelper hierarchical facet helper - * (true to build default, null to omit) - * @param \VuFind\Config\PluginManager $configLoader config loader + * @param \VuFind\Search\Solr\Results $results results object + * @param string $tagSetting Are tags enabled? + * @param string $settings settings + * @param \Laminas\Stdlib\Parameters $request request + * @param \VuFind\Config\PluginManager $configLoader config loader * * @return FavoriteFacets */ @@ -89,7 +87,6 @@ protected function getFavoriteFacets( $tagSetting = 'enabled', $settings = '', $request = null, - $facetHelper = null, $configLoader = null ) { if (null === $results) { @@ -97,7 +94,6 @@ protected function getFavoriteFacets( } $sf = new FavoriteFacets( $configLoader ?? $this->getMockConfigPluginManager([]), - $facetHelper ?? new \VuFind\Search\Solr\HierarchicalFacetHelper(), $tagSetting ); $sf->setConfig($settings); diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php index 0e549351bbc..cd00332691a 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php @@ -30,7 +30,6 @@ namespace VuFindTest\Recommend; use VuFind\Recommend\SideFacets; -use VuFind\Search\Solr\HierarchicalFacetHelper; use VuFind\Search\Solr\Params; use VuFind\Search\Solr\Results;