From b3067d132597292f7b6d898034a96b4ffff19b14 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Tue, 18 Jun 2024 14:53:20 +0300 Subject: [PATCH 1/3] Conflict with search_api 1.35 https://www.drupal.org/project/elasticsearch_connector/issues/3454977 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3fd8481c5..341cc804a 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,8 @@ "drupal/ctools": "<3.11 || ^4.0.1", "drupal/helfi_media_map": "*", "drupal/simple_sitemap": ">4.1.7", - "drush/drush": "<12" + "drush/drush": "<12", + "drupal/search_api": "1.35" }, "extra": { "patches": { From 959fd61553c8827b7350e53de4f66b2f6b8c97a1 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Tue, 18 Jun 2024 15:08:05 +0300 Subject: [PATCH 2/3] Add patch --- patches/issue-3454977.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 patches/issue-3454977.patch diff --git a/patches/issue-3454977.patch b/patches/issue-3454977.patch new file mode 100644 index 000000000..f268dec8e --- /dev/null +++ b/patches/issue-3454977.patch @@ -0,0 +1,13 @@ +diff --git a/src/Plugin/search_api/backend/SearchApiElasticsearchBackend.php b/src/Plugin/search_api/backend/SearchApiElasticsearchBackend.php +index 50732ba..30fdb79 100644 +--- a/src/Plugin/search_api/backend/SearchApiElasticsearchBackend.php ++++ b/src/Plugin/search_api/backend/SearchApiElasticsearchBackend.php +@@ -1233,7 +1233,7 @@ class SearchApiElasticsearchBackend extends BackendPluginBase implements PluginF + * + * Prevents closure serialization error on search_api server add form. + */ +- public function __sleep() { ++ public function __sleep(): array { + return []; + } + From 2c4b3b64103ff9e658f58c0e1b1d6f611cee7f30 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Tue, 18 Jun 2024 15:11:50 +0300 Subject: [PATCH 3/3] Add patch for elasticsearch_connector --- composer.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 341cc804a..115521703 100644 --- a/composer.json +++ b/composer.json @@ -69,8 +69,7 @@ "drupal/ctools": "<3.11 || ^4.0.1", "drupal/helfi_media_map": "*", "drupal/simple_sitemap": ">4.1.7", - "drush/drush": "<12", - "drupal/search_api": "1.35" + "drush/drush": "<12" }, "extra": { "patches": { @@ -104,6 +103,9 @@ }, "drupal/view_unpublished": { "[#UHF-9256] Fix missing dynamic permission dependencies.": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/cbb944ae79643ba7ed895db3fac7f3b3d90ac850/patches/view_unpublished_permissions_missing_dependencies.patch" + }, + "drupal/elasticsearch_connector": { + "https://www.drupal.org/project/elasticsearch_connector/issues/3454977": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/959fd61553c8827b7350e53de4f66b2f6b8c97a1/patches/issue-3454977.patch" } } }