Merged branch '4.6'

Author: alongosz

tests/integration/Core/Repository/SearchServiceTranslationLanguageFallbackTest.php

@@ -1529,11 +1529,11 @@ public function providerForTestFind()
                                 ],
                                 [
                                     self::SETUP_DEDICATED => [
-                                        'searchHitIndex' => 2,
+                                        'searchHitIndex' => 1,
                                         'preparedDataTestIndex' => 2,
                                     ],
                                     self::SETUP_SHARED => [
-                                        'searchHitIndex' => 2,
+                                        'searchHitIndex' => 1,
                                         'preparedDataTestIndex' => 2,
                                     ],
                                     self::SETUP_SINGLE => [
@@ -1557,11 +1557,11 @@ public function providerForTestFind()
                                 ],
                                 [
                                     self::SETUP_DEDICATED => [
-                                        'searchHitIndex' => 1,
+                                        'searchHitIndex' => 2,
                                         'preparedDataTestIndex' => 2,
                                     ],
                                     self::SETUP_SHARED => [
-                                        'searchHitIndex' => 1,
+                                        'searchHitIndex' => 2,
                                         'preparedDataTestIndex' => 2,
                                     ],
                                     self::SETUP_SINGLE => [
@@ -1597,8 +1597,8 @@ public function providerForTestFind()
                                 ],
                                 [
                                     self::SETUP_DEDICATED => [
-                                        'searchHitIndex' => 2,
-                                        'preparedDataTestIndex' => 2,
+                                        'searchHitIndex' => 0,
+                                        'preparedDataTestIndex' => 1,
                                     ],
                                     self::SETUP_SHARED => [
                                         'searchHitIndex' => 0,
@@ -1625,11 +1625,11 @@ public function providerForTestFind()
                                 ],
                                 [
                                     self::SETUP_DEDICATED => [
-                                        'searchHitIndex' => 2,
+                                        'searchHitIndex' => 1,
                                         'preparedDataTestIndex' => 2,
                                     ],
                                     self::SETUP_SHARED => [
-                                        'searchHitIndex' => 2,
+                                        'searchHitIndex' => 1,
                                         'preparedDataTestIndex' => 2,
                                     ],
                                     self::SETUP_SINGLE => [
@@ -1653,11 +1653,11 @@ public function providerForTestFind()
                                 ],
                                 [
                                     self::SETUP_DEDICATED => [
-                                        'searchHitIndex' => 1,
+                                        'searchHitIndex' => 2,
                                         'preparedDataTestIndex' => 2,
                                     ],
                                     self::SETUP_SHARED => [
-                                        'searchHitIndex' => 1,
+                                        'searchHitIndex' => 2,
                                         'preparedDataTestIndex' => 2,
                                     ],
                                     self::SETUP_SINGLE => [
@@ -1737,6 +1737,7 @@ public function testFindContent(
             'filter' => new Criterion\ContentTypeIdentifier('test-type'),
             'sortClauses' => [
                 new SortClause\Field('test-type', 'sort_field'),
+                new SortClause\Field('test-type', 'search_field'),
             ],
         ];
 
@@ -1792,6 +1793,7 @@ public function testFindLocationsSingle(
             ),
             'sortClauses' => [
                 new SortClause\Field('test-type', 'sort_field'),
+                new SortClause\Field('test-type', 'search_field'),
             ],
         ];
 
@@ -1843,6 +1845,7 @@ public function testFindLocationsMultiple(
             'sortClauses' => [
                 new SortClause\Location\Depth(Query::SORT_ASC),
                 new SortClause\Field('test-type', 'sort_field'),
+                new SortClause\Field('test-type', 'search_field'),
             ],
         ];
 
@@ -1897,6 +1900,11 @@ public function testFindLocationsMultiple(
      */
     private function assertIndexName(array $indexMap, SearchHit $searchHit): void
     {
+        if (!$this->isSolrInMaxVersion('9.3.0')) {
+            // In Solr 9.3.0 and later, the shard parameter is not used anymore.
+            return;
+        }
+
         $indexName = $this->getIndexName($indexMap);
 
         if ($indexName === null) {
@@ -1930,4 +1938,14 @@ private function getIndexesToMatchData(
 
         return $indexesToMatchData;
     }
+
+    private function isSolrInMaxVersion(string $maxVersion): bool
+    {
+        $version = getenv('SOLR_VERSION');
+        if (is_string($version) && !empty($version)) {
+            return version_compare($version, $maxVersion, '<');
+        }
+
+        return false;
+    }
 }