Fix more SideFacets constructor calls in tests.

EreMaijala · Aug 22, 2023 · bebad3e · bebad3e
1 parent 2f7f2ea
commit bebad3e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 29 deletions.
diff --git 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
@@ -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
@@ -62,27 +62,21 @@ 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
      */
     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
@@ -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,15 +87,13 @@ protected function getFavoriteFacets(
         $tagSetting = 'enabled',
         $settings = '',
         $request = null,
-        $facetHelper = null,
         $configLoader = null
     ) {
         if (null === $results) {
             $results = $this->getMockResults();
         }
         $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
@@ -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;