Merge branch 'MC-31566' into 2.4-develop

Author: vzabaznov

setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php

@@ -20,7 +20,7 @@
 class Cache implements ConfigOptionsListInterface
 {
     const INPUT_VALUE_CACHE_REDIS = 'redis';
-    const CONFIG_VALUE_CACHE_REDIS = 'Cm_Cache_Backend_Redis';
+    const CONFIG_VALUE_CACHE_REDIS = '\\Magento\\Framework\\Cache\\Backend\Redis';
 
     const INPUT_KEY_CACHE_BACKEND = 'cache-backend';
     const INPUT_KEY_CACHE_BACKEND_REDIS_SERVER = 'cache-backend-redis-server';
@@ -233,7 +233,7 @@ private function validateRedisConfig(array $options, DeploymentConfig $deploymen
                 self::CONFIG_PATH_CACHE_BACKEND_DATABASE,
                 $this->getDefaultConfigValue(self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE)
             );
-        
+
         $config['password'] = isset($options[self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD])
             ? $options[self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD]
             : $deploymentConfig->get(

setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php

@@ -20,7 +20,7 @@
 class PageCache implements ConfigOptionsListInterface
 {
     const INPUT_VALUE_PAGE_CACHE_REDIS = 'redis';
-    const CONFIG_VALUE_PAGE_CACHE_REDIS = 'Cm_Cache_Backend_Redis';
+    const CONFIG_VALUE_PAGE_CACHE_REDIS = '\\Magento\\Framework\\Cache\\Backend\Redis';
 
     const INPUT_KEY_PAGE_CACHE_BACKEND = 'page-cache';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER = 'page-cache-redis-server';

setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php

@@ -91,7 +91,7 @@ public function testCreateConfigCacheRedis()
             'cache' => [
                 'frontend' => [
                     'default' => [
-                        'backend' => 'Cm_Cache_Backend_Redis',
+                        'backend' => '\\Magento\\Framework\\Cache\\Backend\Redis',
                         'backend_options' => [
                             'server' => '',
                             'port' => '',
@@ -120,7 +120,7 @@ public function testCreateConfigWithRedisConfig()
             'cache' => [
                 'frontend' => [
                     'default' => [
-                        'backend' => 'Cm_Cache_Backend_Redis',
+                        'backend' => '\\Magento\\Framework\\Cache\\Backend\Redis',
                         'backend_options' => [
                             'server' => 'localhost',
                             'port' => '1234',

setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php

@@ -91,7 +91,7 @@ public function testCreateConfigWithRedis()
             'cache' => [
                 'frontend' => [
                     'page_cache' => [
-                        'backend' => 'Cm_Cache_Backend_Redis',
+                        'backend' => '\\Magento\\Framework\\Cache\\Backend\Redis',
                         'backend_options' => [
                             'server'=> '',
                             'port' => '',
@@ -120,7 +120,7 @@ public function testCreateConfigWithRedisConfiguration()
             'cache' => [
                 'frontend' => [
                     'page_cache' => [
-                        'backend' => 'Cm_Cache_Backend_Redis',
+                        'backend' => '\\Magento\\Framework\\Cache\\Backend\Redis',
                         'backend_options' => [
                             'server' => 'foo.bar',
                             'port' => '9000',