pass locale to lucene index in multi search context

dachcom-digital · Feb 9, 2024 · 385ff29 · 385ff29
1 parent bec2c3f
commit 385ff29
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -1,9 +1,9 @@
 name: Codeception
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
 
 jobs:
     codeception:

diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -1,9 +1,9 @@
 name: Easy Coding Standards
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
 
 jobs:
     ecs:

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -1,9 +1,9 @@
 name: PHP Stan
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
 
 jobs:
     stan:

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 2.0.2
+- [BUGFIX] Pass locale to lucene index in multi search context
+
 ## 2.0.1
 - [BUGFIX] SnowBallStemmingFilter uses not initialized locale [#15](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-lucene/issues/15)
 - [BUGFIX] basePath is scalar node, not boolean [@dpfaffenbauer](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-lucene/pull/14)

diff --git a/src/DsLuceneBundle/OutputChannel/MultiSearchOutputChannel.php b/src/DsLuceneBundle/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 */