Always dispatch actionFacetedSearchFilters hook

src/Product/Search.php

@@ -130,6 +130,18 @@ public function initSearch($selectedFilters)
         // Adds filters that specific for this controller
         $this->addControllerSpecificFilters();
 
+        // Let modules add their own filters to the adapter. This is dispatched here, after the
+        // controller specific filters, rather than inside addControllerSpecificFilters() because
+        // that method has early returns (e.g. an already selected "Categories" facet) that would
+        // otherwise silently skip the hook and drop the module filters.
+        Hook::exec(
+            'actionFacetedSearchFilters',
+            [
+                'search' => $this,
+                'query' => $this->query,
+            ]
+        );
+
         // Add group by to remove duplicate values
         $this->getSearchAdapter()->addGroupBy('id_product');
 
@@ -451,14 +463,6 @@ private function addControllerSpecificFilters()
                 empty($productPool) ? ['NULL'] : $productPool
             );
         }
-
-        Hook::exec(
-            'actionFacetedSearchFilters',
-            [
-                'search' => $this,
-                'query' => $this->query,
-            ]
-        );
     }
 
     /**

tests/php/FacetedSearch/Product/SearchTest.php

@@ -1192,4 +1192,28 @@ public function testAddFilter()
         $this->search->addFilter('weight', [10, 20]);
         $this->search->addFilter('id_feature', [[10, 20]]);
     }
+
+    /**
+     * The actionFacetedSearchFilters hook must be dispatched even when a controller specific
+     * filter causes an early return inside addControllerSpecificFilters(): on a category query,
+     * selecting a "Categories" facet sets an id_category filter and used to skip the hook.
+     *
+     * @see https://github.com/PrestaShop/ps_facetedsearch/issues/1239
+     */
+    public function testInitSearchDispatchesFacetedSearchFiltersHookWithSelectedCategoryFacet()
+    {
+        $hookCalls = [];
+        $hookMock = Mockery::mock(Hook::class);
+        $hookMock->shouldReceive('exec')
+            ->andReturnUsing(function ($name) use (&$hookCalls) {
+                $hookCalls[] = $name;
+
+                return [];
+            });
+        Hook::setStaticExpectations($hookMock);
+
+        $this->search->initSearch(['category' => [[6]]]);
+
+        $this->assertContains('actionFacetedSearchFilters', $hookCalls);
+    }
 }