ACP2E-658: setup:config:set rewrites cache config in env.php

Author: dhorytskyi

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

@@ -163,7 +163,7 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
         $configData = new ConfigData(ConfigFilePool::APP_ENV);
         if (isset($options[self::INPUT_KEY_CACHE_ID_PREFIX])) {
             $configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $options[self::INPUT_KEY_CACHE_ID_PREFIX]);
-        } else {
+        } elseif (!$deploymentConfig->get(self::CONFIG_PATH_CACHE_ID_PREFIX)) {
             $configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $this->generateCachePrefix());
         }
 

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

@@ -153,7 +153,7 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
         $configData = new ConfigData(ConfigFilePool::APP_ENV);
         if (isset($options[self::INPUT_KEY_PAGE_CACHE_ID_PREFIX])) {
             $configData->set(self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX, $options[self::INPUT_KEY_PAGE_CACHE_ID_PREFIX]);
-        } else {
+        } elseif (!$deploymentConfig->get(self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX)) {
             $configData->set(self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX, $this->generateCachePrefix());
         }
 

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

@@ -126,6 +126,26 @@ public function testCreateConfigCacheRedis()
      */
     public function testCreateConfigWithRedisConfig()
     {
+        $this->deploymentConfigMock->method('get')->withConsecutive(
+            [CacheConfigOptionsList::CONFIG_PATH_CACHE_ID_PREFIX],
+            [CacheConfigOptionsList::CONFIG_PATH_CACHE_BACKEND_SERVER, '127.0.0.1'],
+            [CacheConfigOptionsList::CONFIG_PATH_CACHE_BACKEND_DATABASE, '0'],
+            [CacheConfigOptionsList::CONFIG_PATH_CACHE_BACKEND_PORT, '6379'],
+            [CacheConfigOptionsList::CONFIG_PATH_CACHE_BACKEND_PASSWORD, ''],
+            [CacheConfigOptionsList::CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA, '1'],
+            [CacheConfigOptionsList::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB, ''],
+            [CacheConfigOptionsList::CONFIG_PATH_ALLOW_PARALLEL_CACHE_GENERATION, 'false']
+        )->willReturnOnConsecutiveCalls(
+            'XXX_',
+            '127.0.0.1',
+            '0',
+            '6379',
+            '',
+            '1',
+            '',
+            null
+        );
+
         $expectedConfigData = [
             'cache' => [
                 'frontend' => [
@@ -139,7 +159,6 @@ public function testCreateConfigWithRedisConfig()
                             'compress_data' => '1',
                             'compression_lib' => 'gzip',
                         ],
-                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ],
                 'allow_parallel_generation' => null,

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

@@ -116,6 +116,24 @@ public function testCreateConfigWithRedis()
      */
     public function testCreateConfigWithRedisConfiguration()
     {
+        $this->deploymentConfigMock->method('get')->withConsecutive(
+            [PageCache::CONFIG_PATH_PAGE_CACHE_ID_PREFIX],
+            [PageCache::CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER, '127.0.0.1'],
+            [PageCache::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE, '1'],
+            [PageCache::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT, '6379'],
+            [PageCache::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD, ''],
+            [PageCache::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA, '0'],
+            [PageCache::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB, '']
+        )->willReturnOnConsecutiveCalls(
+            'XXX_',
+            '127.0.0.1',
+            '1',
+            '6379',
+            '',
+            '0',
+            ''
+        );
+
         $expectedConfigData = [
             'cache' => [
                 'frontend' => [
@@ -129,7 +147,6 @@ public function testCreateConfigWithRedisConfiguration()
                             'compress_data' => '1',
                             'compression_lib' => 'gzip',
                         ],
-                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]