Issue #3456385: Add Drupal 11.x support for Elasticsearch Connector

.gitlab-ci.yml

@@ -29,6 +29,9 @@ include:
 #   _CURL_TEMPLATES_REF: 'main'
 variables:
   _PHPUNIT_CONCURRENT: '1'
+  OPT_IN_TEST_PREVIOUS_MINOR: 1
+  OPT_IN_TEST_NEXT_MINOR: 1
+  OPT_IN_TEST_NEXT_MAJOR: 1
 
 # Define an 'elasticsearch' service, running ElasticSearch 8.
 # See also:
@@ -39,7 +42,7 @@ variables:
     # Note that the Container Image below is built from the Dockerfile at
     # https://github.com/elastic/dockerfiles/blob/v8.14.1/elasticsearch/Dockerfile
     # @todo Use latest tag, see https://www.drupal.org/project/elasticsearch_connector/issues/3427060
-    name: docker.elastic.co/elasticsearch/elasticsearch:8.14.1
+    name: docker.elastic.co/elasticsearch/elasticsearch:8.14.3
     # In the following command:
     # - The "echo -Xms256m >> /usr/share/elasticsearch/config/jvm.options" line
     #   sets the minimum JVM Heap Size to 256m.

composer.json

@@ -10,15 +10,11 @@
         "elasticsearch/elasticsearch": "^8"
     },
     "require-dev": {
-        "drush/drush": "^12.0",
+        "drush/drush": "^12.0 || ^13",
         "drupal/coder": "^8.3",
         "phayes/geophp": "^1.2",
         "drupal/devel": "^4.0|^5.0",
-        "drupal/facets": "^3.0.x-dev",
-        "drupal/geofield": "1.x-dev",
-        "drupal/search_api_autocomplete": "1.x-dev",
-        "drupal/search_api_location": "1.x-dev",
-        "drupal/search_api_spellcheck": "3.x-dev"
+        "drupal/geofield": "1.x-dev"
     },
     "suggest": {
         "drupal/facets": "Provides facetted search.",

elasticsearch_connector.info.yml

 name: Elasticsearch Connector
 description: Provides an ElasticSearch backend for Search API.
 php: 8.0
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9 || ^10 | ^11
 package: Search
 type: module
 dependencies:

src/SearchAPI/Query/QueryResultParser.php

@@ -53,7 +53,7 @@ class QueryResultParser {
 
         // Set each item in _source as a field in Search API.
         foreach ($result['_source'] as $id => $values) {
-          // Make everything a multifield.
+          // Make everything a multi-field.
           if (!is_array($values)) {
             $values = [$values];
           }

tests/modules/elasticsearch_connector_test/elasticsearch_connector_test.info.yml

@@ -4,5 +4,5 @@ description: 'ElasticSearch Connector test module'
 package: 'Search'
 dependencies:
   - drupal:search_api_test
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9 || ^10 | ^11
 hidden: true

tests/src/Functional/ElasticsearchConnectorUpdate9800Test.php

@@ -24,8 +24,9 @@ class ElasticsearchConnectorUpdate9800Test extends UpdatePathTestBase {
    * {@inheritdoc}
    */
   protected function setDatabaseDumpFiles() {
+    $core_dump_file = glob(DRUPAL_ROOT . '/core/modules/system/tests/fixtures/update/drupal-*.bare.standard.php.gz')[0];
     $this->databaseDumpFiles = [
-      DRUPAL_ROOT . '/core/modules/system/tests/fixtures/update/drupal-9.4.0.bare.standard.php.gz',
+      $core_dump_file,
       __DIR__ . '/../../../tests/fixtures/update/drupal-9_4_0--search_api-1.31.0--elasticsearch_connector-8.x-7.0-alpha4.php',
     ];
   }

tests/src/Functional/ElasticsearchConnectorUpdate9801Test.php

@@ -24,8 +24,9 @@ class ElasticsearchConnectorUpdate9801Test extends UpdatePathTestBase {
    * {@inheritdoc}
    */
   protected function setDatabaseDumpFiles() {
+    $core_dump_file = glob(DRUPAL_ROOT . '/core/modules/system/tests/fixtures/update/drupal-*.bare.standard.php.gz')[0];
     $this->databaseDumpFiles = [
-      DRUPAL_ROOT . '/core/modules/system/tests/fixtures/update/drupal-9.4.0.bare.standard.php.gz',
+      $core_dump_file,
       __DIR__ . '/../../../tests/fixtures/update/drupal-9_4_0--search_api-1.31.0--elasticsearch_connector-8.x-7.0-alpha4.php',
     ];
   }

tests/src/Functional/ElasticsearchConnectorUpdate9802Test.php

@@ -24,8 +24,9 @@ class ElasticsearchConnectorUpdate9802Test extends UpdatePathTestBase {
    * {@inheritdoc}
    */
   protected function setDatabaseDumpFiles() {
+    $core_dump_file = glob(DRUPAL_ROOT . '/core/modules/system/tests/fixtures/update/drupal-*.bare.standard.php.gz')[0];
     $this->databaseDumpFiles = [
-      DRUPAL_ROOT . '/core/modules/system/tests/fixtures/update/drupal-9.4.0.bare.standard.php.gz',
+      $core_dump_file,
       __DIR__ . '/../../../tests/fixtures/update/drupal-9_4_0--search_api-1.31.0--elasticsearch_connector-8.x-7.0-alpha4.php',
     ];
   }

tests/src/Kernel/DebugLoggingTest.php

@@ -8,6 +8,8 @@ use Drupal\search_api\Entity\Server;
 
 /**
  * Test the enable_debug_logging configuration variables.
+ *
+ * @group elasticsearch_connector
  */
 class DebugLoggingTest extends KernelTestBase {