Merge remote-tracking branch 'origin/2.x' into update-carbon

alexz707 · alexz707 · commit 9ec6ec987c72 · 2025-02-14T12:54:44.000+01:00
# Conflicts:
#	tests/Unit/Service/SearchIndex/CachedSearchIndexMappingServiceTest.php
diff --git a/tests/Unit/Service/SearchIndex/CachedSearchIndexMappingServiceTest.php b/tests/Unit/Service/SearchIndex/CachedSearchIndexMappingServiceTest.php
@@ -36,7 +36,7 @@ public function _before(): void
         });
 
         $this->cachedSearchIndexMappingService = new CachedSearchIndexMappingService(
-            new RuntimeCacheResolver(),
+            new RuntimeCacheResolverContract(),
             $searchIndexServiceMock
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function _before(): void`
`36`	`36`	`});`
`37`	`37`
`38`	`38`	`$this->cachedSearchIndexMappingService = new CachedSearchIndexMappingService(`
`39`		`- new RuntimeCacheResolver(),`
	`39`	`+ new RuntimeCacheResolverContract(),`
`40`	`40`	`$searchIndexServiceMock`
`41`	`41`	`);`
`42`	`42`	`}`