Merge pull request #25 from dachcom-digital/locale_fix

pass locale to lucene index in multi search context
dachcom-digital · Feb 9, 2024 · 0deae38 · 0deae38
2 parents b885564 + 36035cd
commit 0deae38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 3.0.2
+- [BUGFIX] Pass locale to lucene index in multi search context
+
 ## 3.0.1
 - Fix ZendSearch Version Constraint
 

diff --git a/src/Factory/AnalyzerFactory.php b/src/Factory/AnalyzerFactory.php
@@ -106,10 +106,6 @@ public function buildDefaultFilter(?string $currentLocale, array $filterOptions)
         $isLocaleAware = isset($filterOptions['locale_aware']) && is_bool($filterOptions['locale_aware']) && $filterOptions['locale_aware'];
         $filterClass = $filterOptions['class'] ?? SnowBallStemmingFilter::class;
 
-        if ($filterClass === null) {
-            return null;
-        }
-
         if ($isLocaleAware === true && $currentLocale === null) {
             return null;
         }

diff --git a/src/OutputChannel/MultiSearchOutputChannel.php b/src/OutputChannel/MultiSearchOutputChannel.php
@@ -61,14 +61,15 @@ public function getResult(SearchContainerInterface $searchContainer): SearchCont
 
     public function getMultiSearchResult(MultiSearchContainerInterface $multiSearchContainer): MultiSearchContainerInterface
     {
+        $userLocale = $this->outputChannelContext->getRuntimeQueryProvider()->getUserLocale();
         $indexProviderOptions = $this->outputChannelContext->getIndexProviderOptions();
 
         foreach ($multiSearchContainer->getSearchContainer() as $searchContainer) {
 
             $query = $searchContainer->getQuery();
 
             $eventData = $this->eventDispatcher->dispatchAction('build_index', [
-                'index' => $this->storageBuilder->getLuceneIndex($indexProviderOptions, ConfigurationInterface::INDEX_BASE_STABLE)
+                'index' => $this->storageBuilder->getLuceneIndex($indexProviderOptions, ConfigurationInterface::INDEX_BASE_STABLE, $userLocale)
             ]);
 
             /** @var Lucene\SearchIndexInterface $index */