Merge branch search_api_opensearch:3.x into 3285438-the-whole-index

.gitlab-ci.yml

-################
-# DrupalCI GitLabCI template
-#
-# Gitlab-ci.yml to replicate DrupalCI testing for Contrib
-#
-# With thanks to:
-#   * The GitLab Acceleration Initiative participants
-#   * DrupalSpoons
-################
-
-################
-# Guidelines
-#
-# This template is designed to give any Contrib maintainer everything they need to test, without requiring modification. It is also designed to keep up to date with Core Development automatically through the use of include files that can be centrally maintained.
-#
-# However, you can modify this template if you have additional needs for your project.
-################
-
-################
-# Includes
-#
-# Additional configuration can be provided through includes.
-# One advantage of include files is that if they are updated upstream, the changes affect all pipelines using that include.
-#
-# Includes can be overridden by re-declaring anything provided in an include, here in gitlab-ci.yml
-# https://docs.gitlab.com/ee/ci/yaml/includes.html#override-included-configuration-values
-################
-
 include:
-  ################
-  # DrupalCI includes:
-  # As long as you include this, any future includes added by the Drupal Association will be accessible to your pipelines automatically.
-  # View these include files at https://git.drupalcode.org/project/gitlab_templates/
-  ################
   - project: $_GITLAB_TEMPLATES_REPO
     ref: $_GITLAB_TEMPLATES_REF
     file:
@@ -39,17 +6,27 @@ include:
       - '/includes/include.drupalci.variables.yml'
       - '/includes/include.drupalci.workflows.yml'
 
-################
-# Pipeline configuration variables
-#
-# These are the variables provided to the Run Pipeline form that a user may want to override.
-#
-# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
-################
 variables:
   _CSPELL_WORDS: 'aggs,basicauth,asciifolding,datasource,datasources,fuzzyness,geofield,geophp,geopoint,lucene,makina,ngram,opensearchproject,querytime'
+  OPT_IN_TEST_PREVIOUS_MINOR: 1
+  OPT_IN_TEST_NEXT_MINOR: 1
+  OPT_IN_TEST_NEXT_MAJOR: 1
+
+composer (next major):
+  variables:
+    _LENIENT_ALLOW_LIST: geofield
+
+phpcs:
+  allow_failure: false
+
+phpstan:
+  allow_failure: false
+
+phpstan (next major):
+  allow_failure: true
 
-#   SKIP_ESLINT: '1'
+phpstan (next minor):
+  allow_failure: true
 
 phpunit:
   extends: .phpunit-base

composer.json

@@ -5,7 +5,7 @@
     "license": "GPL-2.0-or-later",
     "require": {
         "php": "^8",
-        "drupal/search_api": "^1.23",
+        "drupal/search_api": "^1.34",
         "makinacorpus/php-lucene": "^1.1",
         "opensearch-project/opensearch-php": "^2.0"
     },

modules/search_api_aws_signature_connector/search_api_aws_signature_connector.info.yml

 name: Search API OpenSearch AWS Signature Connector
 description: Provides an OpenSearch connector using AWS Signature.
 php: 8.0
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9 || ^10 || ^11
 package: Search
 type: module
 dependencies:

modules/search_api_opensearch_location/search_api_opensearch_location.info.yml

 name: Search API OpenSearch Location
 description: Provides location related functionality for OpenSearch.
 php: 8.0
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9 || ^10 || ^11
 package: Search
 type: module
 dependencies:

search_api_opensearch.info.yml

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

tests/src/Kernel/MoreLikeThisParamBuilderKernelTest.php

@@ -6,6 +6,7 @@ namespace Drupal\Tests\search_api_opensearch\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\search_api\Utility\Utility;
+use Drupal\search_api_opensearch\SearchAPI\MoreLikeThisParamBuilder;
 use Drupal\Tests\search_api\Functional\ExampleContentTrait;
 
 /**
@@ -78,7 +79,9 @@ class MoreLikeThisParamBuilderKernelTest extends KernelTestBase {
    */
   public function testBuild(): void {
     $mltBuilder = $this->container->get('search_api_opensearch.more_like_this_param_builder');
+    assert($mltBuilder instanceof MoreLikeThisParamBuilder);
     $id = array_key_first($this->ids);
+    $this->assertNotNull($id);
     $params = $mltBuilder->buildMoreLikeThisQuery([
       'id' => $id,
       'fields' => ['*'],

tests/src/Unit/Plugin/processor/DateRangeTest.php

@@ -158,7 +158,7 @@ class DateRangeTest extends UnitTestCase {
   /**
    * Provides dummy date range data.
    */
-  public function dateValueDataProvider(): array {
+  public static function dateValueDataProvider(): array {
     return [
       'Single date range' => [
         [