From 0553ce57293530377ac8453e3d51e08468ce57c0 Mon Sep 17 00:00:00 2001 From: Magnus Bengtsson Date: Mon, 15 Apr 2019 08:31:29 +1200 Subject: [PATCH 01/15] Added php 7.2 support --- README.md | 1 + _config.php | 4 ++++ code/search/SearchIndex.php | 2 +- code/search/SearchUpdater.php | 2 +- code/solr/Solr.php | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a5389d3..4739d40 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-fulltextsearch.png?branch=master)](http://travis-ci.org/silverstripe/silverstripe-fulltextsearch) Adds support for fulltext search engines like Sphinx and Solr to SilverStripe CMS. +Compatible with PHP 7.2 ## Maintainer Contact diff --git a/_config.php b/_config.php index c9e422a..01508fb 100644 --- a/_config.php +++ b/_config.php @@ -1,5 +1,9 @@ addFulltextField($field); } diff --git a/code/search/SearchUpdater.php b/code/search/SearchUpdater.php index 12e0740..2e5f6f6 100644 --- a/code/search/SearchUpdater.php +++ b/code/search/SearchUpdater.php @@ -12,7 +12,7 @@ * * TODO: The way we bind in is awful hacky. */ -class SearchUpdater extends Object +class SearchUpdater extends SS_Object { /** * Replace the database object with a subclass that captures all manipulations and passes them to us diff --git a/code/solr/Solr.php b/code/solr/Solr.php index b93d044..ec8e12b 100644 --- a/code/solr/Solr.php +++ b/code/solr/Solr.php @@ -117,7 +117,7 @@ class Solr $options = self::solr_options(); if (!self::$service_singleton) { - self::$service_singleton = Object::create( + self::$service_singleton = SS_Object::create( $options['service'], $options['host'], $options['port'], $options['path'] ); } From ab8e316f5bea087a451131b5d01d7aeb673e3be8 Mon Sep 17 00:00:00 2001 From: Magnus Bengtsson Date: Mon, 15 Apr 2019 08:31:29 +1200 Subject: [PATCH 02/15] Added php 7.2 support --- README.md | 1 + _config.php | 4 ++++ code/search/SearchIndex.php | 2 +- code/search/SearchUpdater.php | 2 +- code/solr/Solr.php | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a5389d3..4739d40 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-fulltextsearch.png?branch=master)](http://travis-ci.org/silverstripe/silverstripe-fulltextsearch) Adds support for fulltext search engines like Sphinx and Solr to SilverStripe CMS. +Compatible with PHP 7.2 ## Maintainer Contact diff --git a/_config.php b/_config.php index c9e422a..01508fb 100644 --- a/_config.php +++ b/_config.php @@ -1,5 +1,9 @@ addFulltextField($field); } diff --git a/code/search/SearchUpdater.php b/code/search/SearchUpdater.php index 12e0740..2e5f6f6 100644 --- a/code/search/SearchUpdater.php +++ b/code/search/SearchUpdater.php @@ -12,7 +12,7 @@ * * TODO: The way we bind in is awful hacky. */ -class SearchUpdater extends Object +class SearchUpdater extends SS_Object { /** * Replace the database object with a subclass that captures all manipulations and passes them to us diff --git a/code/solr/Solr.php b/code/solr/Solr.php index b93d044..ec8e12b 100644 --- a/code/solr/Solr.php +++ b/code/solr/Solr.php @@ -117,7 +117,7 @@ class Solr $options = self::solr_options(); if (!self::$service_singleton) { - self::$service_singleton = Object::create( + self::$service_singleton = SS_Object::create( $options['service'], $options['host'], $options['port'], $options['path'] ); } From f2e3db6586daae035f7371be00fe63b85e7f7a35 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 23 Jul 2019 12:31:10 +0200 Subject: [PATCH 03/15] NEW Bump minimum PHP to 7.1, SilverStripe to 3.7, replace PHP 7.2 incompatible code --- .travis.yml | 26 ++++++++++++-------------- README.md | 2 +- _config.php | 4 ---- code/search/SearchIndex.php | 6 ++++-- composer.json | 11 ++++------- 5 files changed, 21 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26029fb..b6751d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,20 @@ language: php -sudo: false +dist: trusty matrix: include: - - php: 5.4 - env: DB=PGSQL CORE_RELEASE=3.1 - - php: 5.5 - env: DB=MYSQL CORE_RELEASE=3.2 - - php: 5.6 - env: DB=MYSQL CORE_RELEASE=3.3 SUBSITES=1 - - php: 5.6 - env: DB=MYSQL CORE_RELEASE=3.3 QUEUEDJOBS=1 - - php: 7.1 - env: DB=MYSQL CORE_RELEASE=3.6 - - php: 7.1 - env: DB=MYSQL CORE_RELEASE=3 + - php: '7.1' + env: DB=PGSQL CORE_RELEASE=3.7 + - php: '7.1' + env: DB=MYSQL CORE_RELEASE=3.7 + - php: '7.2' + env: DB=MYSQL CORE_RELEASE=3.7 SUBSITES=1 + - php: '7.2' + env: DB=MYSQL CORE_RELEASE=3.7 QUEUEDJOBS=1 + - php: '7.3' + env: DB=MYSQL CORE_RELEASE=3.7 before_script: - composer self-update || true @@ -28,4 +26,4 @@ before_script: - cd ~/builds/ss script: - - vendor/bin/phpunit fulltextsearch/tests/ + - vendor/bin/phpunit fulltextsearch/tests diff --git a/README.md b/README.md index 4739d40..e8d3f0b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Compatible with PHP 7.2 ## Requirements -* SilverStripe 3.1+ +* SilverStripe 3.7+ (see previous 2.x releases for earlier SilverStripe 3 support, and 3.x for SilverStripe 4) * (optional) [silverstripe-phockito](https://github.com/hafriedlander/silverstripe-phockito) (for testing) ## Documentation diff --git a/_config.php b/_config.php index 01508fb..c9e422a 100644 --- a/_config.php +++ b/_config.php @@ -1,9 +1,5 @@ Date: Mon, 5 Aug 2019 16:17:49 +1200 Subject: [PATCH 04/15] ENHANCEMENT Add extension point to appliesTo for SearchVariantSubsites --- src/Search/Variants/SearchVariant.php | 2 ++ src/Search/Variants/SearchVariantSubsites.php | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Search/Variants/SearchVariant.php b/src/Search/Variants/SearchVariant.php index f1b4463..eeaf970 100644 --- a/src/Search/Variants/SearchVariant.php +++ b/src/Search/Variants/SearchVariant.php @@ -4,6 +4,7 @@ namespace SilverStripe\FullTextSearch\Search\Variants; use ReflectionClass; use SilverStripe\Core\ClassInfo; +use SilverStripe\Core\Extensible; use SilverStripe\Core\Config\Configurable; use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex; use SilverStripe\FullTextSearch\Search\Queries\SearchQuery; @@ -16,6 +17,7 @@ use SilverStripe\FullTextSearch\Utils\CombinationsArrayIterator; abstract class SearchVariant { use Configurable; + use Extensible; /** * Whether this variant is enabled diff --git a/src/Search/Variants/SearchVariantSubsites.php b/src/Search/Variants/SearchVariantSubsites.php index 96ca6a2..e58c9da 100644 --- a/src/Search/Variants/SearchVariantSubsites.php +++ b/src/Search/Variants/SearchVariantSubsites.php @@ -36,10 +36,14 @@ class SearchVariantSubsites extends SearchVariant // Include all DataExtensions that contain a SubsiteID. // TODO: refactor subsites to inherit a common interface, so we can run introspection once only. - return SearchIntrospection::has_extension($class, SiteTreeSubsites::class, $includeSubclasses) + $appliesTo = SearchIntrospection::has_extension($class, SiteTreeSubsites::class, $includeSubclasses) || SearchIntrospection::has_extension($class, GroupSubsites::class, $includeSubclasses) || SearchIntrospection::has_extension($class, FileSubsites::class, $includeSubclasses) || SearchIntrospection::has_extension($class, SiteConfigSubsites::class, $includeSubclasses); + + $this->extend('updateAppliesTo', $appliesTo, $class, $includeSubclasses); + + return $appliesTo; } public function currentState() From a724dc7117b536c6796bc84ea03551b7b04c6ffa Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 12 Aug 2019 16:47:30 +1200 Subject: [PATCH 05/15] FIX Restore PHP 5.6 support --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 9f30587..8031856 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ } ], "require": { - "php": "^7.1", "silverstripe/framework": "~3.7", "monolog/monolog": "~1.15" }, From 8de398ae75a835ead7719de10680b50f77bd0f53 Mon Sep 17 00:00:00 2001 From: Jani Kiviranta Date: Mon, 26 Aug 2019 13:05:34 +0300 Subject: [PATCH 06/15] Translation + Finnish Added Finnish translation and support for translations in result template. --- lang/fi.yml | 10 ++++++++++ templates/Layout/Page_results_solr.ss | 10 +++++----- 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 lang/fi.yml diff --git a/lang/fi.yml b/lang/fi.yml new file mode 100644 index 0000000..f8a4426 --- /dev/null +++ b/lang/fi.yml @@ -0,0 +1,10 @@ +FI: + SilverStripe\FullTextSearch\Solr\Forms\SearchForm: + GO: Suorita + SEARCH: Haku + SearchQuery: 'Hakusanasi oli' + DidYouMean: 'Tarkoititko' + ReadMore: 'Lue lisää' + NoResults: 'Pahoittelut, mutta hakusi ei tuottanut yhtään osumaa.' + Page: 'Sivu' + of: '/' diff --git a/templates/Layout/Page_results_solr.ss b/templates/Layout/Page_results_solr.ss index d573908..aa96265 100644 --- a/templates/Layout/Page_results_solr.ss +++ b/templates/Layout/Page_results_solr.ss @@ -2,11 +2,11 @@

$Title

<% if $Query %> -

You searched for "{$Query}"

+

<%t SearchQuery 'You searched for' %> "{$Query}"

<% end_if %> <% if $Results.Suggestion %> -

Did you mean $Results.SuggestionNice?

+

<%t DidYouMean 'Did you mean' %> $Results.SuggestionNice?

<% end_if %> <% if $Results.Matches %> @@ -23,12 +23,12 @@

<% if $Abstract %>$Abstract.XML<% else %>$Content.ContextSummary<% end_if %>

- Read more about "{$Title}"... + <%t ReadMore 'Read more about' %> "{$Title}"... <% end_loop %> <% else %> -

Sorry, your search query did not return any results.

+

<%t NoResults 'Sorry, your search query did not return any results.' %>

<% end_if %> <% if $Results.Matches.MoreThanOnePage %> @@ -50,7 +50,7 @@ <% end_if %> -

Page $Results.Matches.CurrentPage of $Results.Matches.TotalPages

+

<%t Page 'Page' %> $Results.Matches.CurrentPage <%t of 'of' %> $Results.Matches.TotalPages

<% end_if %> From f35fe8ea24de949400da660684c91e3d76f9aee1 Mon Sep 17 00:00:00 2001 From: Jani Kiviranta Date: Mon, 26 Aug 2019 13:15:57 +0300 Subject: [PATCH 07/15] Fixes for translations. --- lang/fi.yml | 5 +++-- templates/Layout/Page_results_solr.ss | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lang/fi.yml b/lang/fi.yml index f8a4426..2cdb848 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -1,7 +1,8 @@ -FI: +fi: SilverStripe\FullTextSearch\Solr\Forms\SearchForm: - GO: Suorita + GO: Hae SEARCH: Haku + Results: SearchQuery: 'Hakusanasi oli' DidYouMean: 'Tarkoititko' ReadMore: 'Lue lisää' diff --git a/templates/Layout/Page_results_solr.ss b/templates/Layout/Page_results_solr.ss index aa96265..a6af324 100644 --- a/templates/Layout/Page_results_solr.ss +++ b/templates/Layout/Page_results_solr.ss @@ -1,12 +1,12 @@
-

$Title

+

$Title rer

<% if $Query %> -

<%t SearchQuery 'You searched for' %> "{$Query}"

+

<%t Results.SearchQuery 'You searched for' %> "{$Query}"

<% end_if %> <% if $Results.Suggestion %> -

<%t DidYouMean 'Did you mean' %> $Results.SuggestionNice?

+

<%t Results.DidYouMean 'Did you mean' %> $Results.SuggestionNice?

<% end_if %> <% if $Results.Matches %> @@ -23,12 +23,12 @@

<% if $Abstract %>$Abstract.XML<% else %>$Content.ContextSummary<% end_if %>

- <%t ReadMore 'Read more about' %> "{$Title}"... + <%t Results.ReadMore 'Read more about' %> "{$Title}"... <% end_loop %> <% else %> -

<%t NoResults 'Sorry, your search query did not return any results.' %>

+

<%t Results.NoResults 'Sorry, your search query did not return any results.' %>

<% end_if %> <% if $Results.Matches.MoreThanOnePage %> @@ -50,7 +50,7 @@ <% end_if %>
-

<%t Page 'Page' %> $Results.Matches.CurrentPage <%t of 'of' %> $Results.Matches.TotalPages

+

<%t Results.Page 'Page' %> $Results.Matches.CurrentPage <%t Results.of 'of' %> $Results.Matches.TotalPages

<% end_if %> From b054760129a3ca2128a03e5a88f645a7932f0ac4 Mon Sep 17 00:00:00 2001 From: Jani Kiviranta Date: Mon, 26 Aug 2019 13:17:57 +0300 Subject: [PATCH 08/15] Removed test characters --- templates/Layout/Page_results_solr.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Layout/Page_results_solr.ss b/templates/Layout/Page_results_solr.ss index a6af324..cf2a457 100644 --- a/templates/Layout/Page_results_solr.ss +++ b/templates/Layout/Page_results_solr.ss @@ -1,5 +1,5 @@
-

$Title rer

+

$Title

<% if $Query %>

<%t Results.SearchQuery 'You searched for' %> "{$Query}"

From 4f3c2828a461a670e82655d406ca915b9ee16a84 Mon Sep 17 00:00:00 2001 From: Jani Kiviranta Date: Sun, 8 Sep 2019 22:08:39 +0300 Subject: [PATCH 09/15] Changed translation key for more specific Also added View Previous/Next Page translations with Page number translation. --- lang/fi.yml | 5 ++++- templates/Layout/Page_results_solr.ss | 16 ++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lang/fi.yml b/lang/fi.yml index 2cdb848..04c9b60 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -2,10 +2,13 @@ fi: SilverStripe\FullTextSearch\Solr\Forms\SearchForm: GO: Hae SEARCH: Haku - Results: + SolrResultsPage: SearchQuery: 'Hakusanasi oli' DidYouMean: 'Tarkoititko' ReadMore: 'Lue lisää' NoResults: 'Pahoittelut, mutta hakusi ei tuottanut yhtään osumaa.' Page: 'Sivu' of: '/' + ViewPreviousPage: 'Katso edellinen sivu' + View page number: 'Siirry sivulle' + ViewNextPage: 'Katso seuraava sivu' diff --git a/templates/Layout/Page_results_solr.ss b/templates/Layout/Page_results_solr.ss index cf2a457..0ebb620 100644 --- a/templates/Layout/Page_results_solr.ss +++ b/templates/Layout/Page_results_solr.ss @@ -2,11 +2,11 @@

$Title

<% if $Query %> -

<%t Results.SearchQuery 'You searched for' %> "{$Query}"

+

<%t SolrResultsPage.SearchQuery 'You searched for' %> "{$Query}"

<% end_if %> <% if $Results.Suggestion %> -

<%t Results.DidYouMean 'Did you mean' %> $Results.SuggestionNice?

+

<%t SolrResultsPage.DidYouMean 'Did you mean' %> $Results.SuggestionNice?

<% end_if %> <% if $Results.Matches %> @@ -23,34 +23,34 @@

<% if $Abstract %>$Abstract.XML<% else %>$Content.ContextSummary<% end_if %>

- <%t Results.ReadMore 'Read more about' %> "{$Title}"... + <%t SolrResultsPage.ReadMore 'Read more about' %> "{$Title}"... <% end_loop %> <% else %> -

<%t Results.NoResults 'Sorry, your search query did not return any results.' %>

+

<%t SolrResultsPage.NoResults 'Sorry, your search query did not return any results.' %>

<% end_if %> <% if $Results.Matches.MoreThanOnePage %>
-

<%t Results.Page 'Page' %> $Results.Matches.CurrentPage <%t Results.of 'of' %> $Results.Matches.TotalPages

+

<%t SolrResultsPage.Page 'Page' %> $Results.Matches.CurrentPage <%t SolrResultsPage.of 'of' %> $Results.Matches.TotalPages

<% end_if %>
From 6fc5a6fb34c623178461039196d8e13dfb5f1973 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Wed, 11 Sep 2019 15:29:04 +1200 Subject: [PATCH 10/15] Add type mappings for dbdatetime --- src/Solr/SolrIndex.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Solr/SolrIndex.php b/src/Solr/SolrIndex.php index 19cb1dc..44d59c4 100644 --- a/src/Solr/SolrIndex.php +++ b/src/Solr/SolrIndex.php @@ -31,6 +31,9 @@ abstract class SolrIndex extends SearchIndex '*' => 'string', 'Boolean' => 'boolean', 'Date' => 'tdate', + 'Datetime' => 'tdate', + 'DBDate' => 'tdate', + 'DBDatetime' => 'tdate', 'SSDatetime' => 'tdate', 'SS_Datetime' => 'tdate', 'ForeignKey' => 'tint', From 867118c6f40407716214ca5c7f04bb169cfe4662 Mon Sep 17 00:00:00 2001 From: Jani Kiviranta Date: Wed, 11 Sep 2019 16:41:53 +0300 Subject: [PATCH 11/15] Added translatable title ReadMoreLink title translation is added. --- templates/Layout/Page_results_solr.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Layout/Page_results_solr.ss b/templates/Layout/Page_results_solr.ss index 0ebb620..a2f09c8 100644 --- a/templates/Layout/Page_results_solr.ss +++ b/templates/Layout/Page_results_solr.ss @@ -23,7 +23,7 @@

<% if $Abstract %>$Abstract.XML<% else %>$Content.ContextSummary<% end_if %>

- <%t SolrResultsPage.ReadMore 'Read more about' %> "{$Title}"... + <%t SolrResultsPage.ReadMore 'Read more about' %> "{$Title}"... <% end_loop %> From 72bc71a6a18e8003ad5d79d634121ede59c4103d Mon Sep 17 00:00:00 2001 From: Brett Tasker Date: Wed, 8 Jan 2020 12:46:13 +1300 Subject: [PATCH 12/15] FIX: #270 - Reset variant state back to original state after processing --- src/Solr/Reindex/Handlers/SolrReindexBase.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Solr/Reindex/Handlers/SolrReindexBase.php b/src/Solr/Reindex/Handlers/SolrReindexBase.php index ed36bcc..1f53829 100644 --- a/src/Solr/Reindex/Handlers/SolrReindexBase.php +++ b/src/Solr/Reindex/Handlers/SolrReindexBase.php @@ -99,6 +99,8 @@ abstract class SolrReindexBase implements SolrReindexHandler $batchSize, $taskName ) { + // Get current state + $originalState = SearchVariant::current_state(); // Set state SearchVariant::activate_state($state); @@ -122,6 +124,9 @@ abstract class SolrReindexBase implements SolrReindexHandler for ($group = 0; $group < $groups; $group++) { $this->processGroup($logger, $indexInstance, $state, $class, $groups, $group, $taskName); } + + // Reset state to originalState + SearchVariant::activate_state($originalState); } /** @@ -168,7 +173,11 @@ abstract class SolrReindexBase implements SolrReindexHandler ) { // Set time limit and state Environment::increaseTimeLimitTo(); + // Get current state + $originalState = SearchVariant::current_state(); + // Set state SearchVariant::activate_state($state); + $logger->info("Adding $class"); // Prior to adding these records to solr, delete existing solr records @@ -187,6 +196,9 @@ abstract class SolrReindexBase implements SolrReindexHandler } $logger->info("Updated " . implode(',', $processed)); + // Reset state to originalState + SearchVariant::activate_state($originalState); + // This will slow down things a tiny bit, but it is done so that we don't timeout to the database during a reindex DB::query('SELECT 1'); From 957037fc433f06472152dd61876c79be57370c8e Mon Sep 17 00:00:00 2001 From: Naomi Guyer Date: Mon, 10 Feb 2020 16:20:29 +1300 Subject: [PATCH 13/15] FIX: SearchUpdateQueuedJobProcessor JobType NULL getJobType method returns null as querying a string rather than a namespaced class. --- src/Search/Processors/SearchUpdateQueuedJobProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Search/Processors/SearchUpdateQueuedJobProcessor.php b/src/Search/Processors/SearchUpdateQueuedJobProcessor.php index da20d19..17ff541 100644 --- a/src/Search/Processors/SearchUpdateQueuedJobProcessor.php +++ b/src/Search/Processors/SearchUpdateQueuedJobProcessor.php @@ -40,7 +40,7 @@ class SearchUpdateQueuedJobProcessor extends SearchUpdateBatchedProcessor implem public function getJobType() { - return Config::inst()->get('SearchUpdateQueuedJobProcessor', 'reindex_queue'); + return Config::inst()->get(SearchUpdateQueuedJobProcessor::class, 'reindex_queue'); } public function jobFinished() From 1e2019ba4f69a2863489088a491aad35054aa2c4 Mon Sep 17 00:00:00 2001 From: Naomi Guyer Date: Mon, 10 Feb 2020 16:26:12 +1300 Subject: [PATCH 14/15] Update SearchUpdateQueuedJobProcessor.php --- src/Search/Processors/SearchUpdateQueuedJobProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Search/Processors/SearchUpdateQueuedJobProcessor.php b/src/Search/Processors/SearchUpdateQueuedJobProcessor.php index 17ff541..edb7002 100644 --- a/src/Search/Processors/SearchUpdateQueuedJobProcessor.php +++ b/src/Search/Processors/SearchUpdateQueuedJobProcessor.php @@ -40,7 +40,7 @@ class SearchUpdateQueuedJobProcessor extends SearchUpdateBatchedProcessor implem public function getJobType() { - return Config::inst()->get(SearchUpdateQueuedJobProcessor::class, 'reindex_queue'); + return Config::inst()->get(__CLASS__, 'reindex_queue'); } public function jobFinished() From d759a78182eb10673f81cd964df7c6677c411940 Mon Sep 17 00:00:00 2001 From: Naomi Guyer Date: Mon, 10 Feb 2020 17:05:16 +1300 Subject: [PATCH 15/15] FIX: allow update processor to be overriden by existing yml One of the update commits (6066af5841fd1df21ef32ff3fa089c6e48ea4f26) replaced SearchUpdateProcessor with SearchUpdateImmediateProcessor, but that means that the existing processor yml fails to replace the SearchUpdateImmediateProcessor with SearchUpdateQueuedJobProcessor as I think is intended? c.f https://github.com/silverstripe/silverstripe-fulltextsearch/blob/3/_config/processor.yml#L19 --- src/Search/Updaters/SearchUpdater.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Search/Updaters/SearchUpdater.php b/src/Search/Updaters/SearchUpdater.php index f3a8b45..d279ace 100644 --- a/src/Search/Updaters/SearchUpdater.php +++ b/src/Search/Updaters/SearchUpdater.php @@ -11,7 +11,8 @@ use SilverStripe\ORM\DB; use SilverStripe\FullTextSearch\Search\FullTextSearch; use SilverStripe\FullTextSearch\Search\SearchIntrospection; use SilverStripe\FullTextSearch\Search\Variants\SearchVariant; -use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateImmediateProcessor; +use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateProcessor; + use ReflectionClass; /** @@ -151,7 +152,7 @@ class SearchUpdater foreach ($dirtyids as $dirtyclass => $ids) { if ($ids) { if (!self::$processor) { - self::$processor = Injector::inst()->create(SearchUpdateImmediateProcessor::class); + self::$processor = Injector::inst()->create(SearchUpdateProcessor::class); } self::$processor->addDirtyIDs($dirtyclass, $ids, $index); }