changes to fix merge config

Author: ashvini22326

src/Config/Factory/Cache.php

@@ -32,7 +32,7 @@ class Cache
     public const REDIS_BACKEND_CM_CACHE = 'Cm_Cache_Backend_Redis';
     public const REDIS_BACKEND_REDIS_CACHE = '\Magento\Framework\Cache\Backend\Redis';
 
-    public const VALKEY_BACKEND_CM_CACHE = 'Cm_Cache_Backend_Valkey';
+    public const VALKEY_BACKEND_CM_CACHE = 'Cm_Cache_Backend_Redis';
     public const VALKEY_BACKEND_VALKEY_CACHE = '\Magento\Framework\Cache\Backend\Valkey';
 
     public const VALKEY_BACKEND_REMOTE_SYNCHRONIZED_CACHE = '\Magento\Framework\Cache\Backend\RemoteSynchronizedCache';

src/Test/Functional/Acceptance/ValkeyCest.php

@@ -56,7 +56,7 @@ public function testDefaultConfiguration(\CliTester $I, \Codeception\Example $da
         $config = $this->getConfig($I);
 
         $I->assertSame(
-            'Cm_Cache_Backend_Valkey',
+            'Cm_Cache_Backend_Redis',
             $config['cache']['frontend']['default']['backend'],
             'Wrong backend model'
         );
@@ -72,7 +72,7 @@ public function testDefaultConfiguration(\CliTester $I, \Codeception\Example $da
             $I
         );
         $I->assertSame(
-            'Cm_Cache_Backend_Valkey',
+            'Cm_Cache_Backend_Redis',
             $config['cache']['frontend']['page_cache']['backend'],
             'Wrong backend model'
         );

src/Test/Unit/Config/Factory/CacheTest.php

@@ -728,7 +728,7 @@ public function getFromRelationshipsDataProviderValkey(): array
         $resultMasterOnlyConnection = [
             'frontend' => [
                 'default' => [
-                    'backend' => 'Cm_Cache_Backend_Valkey',
+                    'backend' => 'Cm_Cache_Backend_Redis',
                     'backend_options' => [
                         'server' => 'master.host',
                         'port' => 'master.port',
@@ -737,7 +737,7 @@ public function getFromRelationshipsDataProviderValkey(): array
                     ],
                 ],
                 'page_cache' => [
-                    'backend' => 'Cm_Cache_Backend_Valkey',
+                    'backend' => 'Cm_Cache_Backend_Redis',
                     'backend_options' => [
                         'server' => 'master.host',
                         'password' => 'master.password',
@@ -1150,7 +1150,7 @@ public function testEnvConfigurationMergingValkey(
                 ],
                 [
                     DeployInterface::VAR_CACHE_VALKEY_BACKEND,
-                    'Cm_Cache_Backend_Valkey',
+                    'Cm_Cache_Backend_Redis',
                 ],
             ]);
         $this->valkeyMock->expects(self::any())
@@ -1183,7 +1183,7 @@ public function envConfigurationMergingDataProviderValkey(): array
         $result = [
             'frontend' => [
                 'default' => [
-                    'backend' => 'Cm_Cache_Backend_Valkey',
+                    'backend' => 'Cm_Cache_Backend_Redis',
                     'backend_options' => [
                         'server' => 'master.host',
                         'port' => 'master.port',
@@ -1192,7 +1192,7 @@ public function envConfigurationMergingDataProviderValkey(): array
                     ],
                 ],
                 'page_cache' => [
-                    'backend' => 'Cm_Cache_Backend_Valkey',
+                    'backend' => 'Cm_Cache_Backend_Redis',
                     'backend_options' => [
                         'server' => 'master.host',
                         'port' => 'master.port',

src/Test/Unit/Config/SchemaTest.php

@@ -124,7 +124,7 @@ public function testGetDefaultsForDeploy(): void
                 DeployInterface::VAR_CONSUMERS_WAIT_FOR_MAX_MESSAGES => false,
                 DeployInterface::VAR_SPLIT_DB => [],
                 DeployInterface::VAR_CACHE_REDIS_BACKEND => 'Cm_Cache_Backend_Redis',
-                DeployInterface::VAR_CACHE_VALKEY_BACKEND => 'Cm_Cache_Backend_Valkey',
+                DeployInterface::VAR_CACHE_VALKEY_BACKEND => 'Cm_Cache_Backend_Redis',
                 DeployInterface::VAR_REMOTE_STORAGE => [],
                 DeployInterface::VAR_SCD_NO_PARENT => false,
                 DeployInterface::VAR_USE_LUA => false,