Merge pull request #1094 from Hlavtox/php-84

Fix PHP 8.4 compatibility
PrestaShop · Nov 29, 2024 · 79d694e · 79d694e
2 parents 1872d56 + 7d982c7
commit 79d694e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/Hook/ProductSearch.php b/src/Hook/ProductSearch.php
@@ -24,6 +24,7 @@
 use PrestaShop\Module\FacetedSearch\Filters\Converter;
 use PrestaShop\Module\FacetedSearch\Filters\DataAccessor;
 use PrestaShop\Module\FacetedSearch\Filters\Provider;
+use PrestaShop\Module\FacetedSearch\Product\SearchFactory;
 use PrestaShop\Module\FacetedSearch\Product\SearchProvider;
 use PrestaShop\Module\FacetedSearch\URLSerializer;
 use PrestaShop\PrestaShop\Core\Product\Search\ProductSearchQuery;
@@ -110,7 +111,7 @@ public function productSearchProvider(array $params)
             ),
             $urlSerializer,
             $dataAccessor,
-            null,
+            new SearchFactory(),
             $provider
         );
     }

diff --git a/src/Product/SearchProvider.php b/src/Product/SearchProvider.php
@@ -71,14 +71,14 @@ public function __construct(
         Filters\Converter $converter,
         URLSerializer $serializer,
         Filters\DataAccessor $dataAccessor,
-        SearchFactory $searchFactory = null,
+        SearchFactory $searchFactory,
         Filters\Provider $provider
     ) {
         $this->module = $module;
         $this->filtersConverter = $converter;
         $this->urlSerializer = $serializer;
         $this->dataAccessor = $dataAccessor;
-        $this->searchFactory = $searchFactory === null ? new SearchFactory() : $searchFactory;
+        $this->searchFactory = $searchFactory;
         $this->provider = $provider;
     }
 

diff --git a/tests/php/FacetedSearch/Product/SearchProviderTest.php b/tests/php/FacetedSearch/Product/SearchProviderTest.php
@@ -28,6 +28,7 @@
 use PrestaShop\Module\FacetedSearch\Filters\Converter;
 use PrestaShop\Module\FacetedSearch\Filters\DataAccessor;
 use PrestaShop\Module\FacetedSearch\Filters\Provider;
+use PrestaShop\Module\FacetedSearch\Product\SearchFactory;
 use PrestaShop\Module\FacetedSearch\Product\SearchProvider;
 use PrestaShop\Module\FacetedSearch\URLSerializer;
 use PrestaShop\PrestaShop\Core\Product\Search\Facet;
@@ -149,7 +150,7 @@ protected function setUp()
             $this->converter,
             $this->serializer,
             new DataAccessor($this->database),
-            null,
+            new SearchFactory(),
             new Provider($this->database)
         );
     }