Merge pull request #776 from City-of-Helsinki/UHF-X-search_api_issue

Conflict with search_api 1.35
City-of-Helsinki · Jun 18, 2024 · b6246e6 · b6246e6
2 parents cc8dc03 + 2c4b3b6
commit b6246e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -103,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"
             }
         }
     }

diff --git a/patches/issue-3454977.patch 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 [];
+   }
+