|
6 | 6 |
|
7 | 7 | namespace Magento\Setup\Model\ConfigOptionsList;
|
8 | 8 |
|
9 |
| -use Magento\Framework\Setup\ConfigOptionsListInterface; |
10 |
| -use Magento\Framework\Config\File\ConfigFilePool; |
11 | 9 | use Magento\Framework\App\DeploymentConfig;
|
12 | 10 | use Magento\Framework\Config\Data\ConfigData;
|
| 11 | +use Magento\Framework\Config\File\ConfigFilePool; |
| 12 | +use Magento\Framework\Setup\ConfigOptionsListInterface; |
13 | 13 | use Magento\Framework\Setup\Option\SelectConfigOption;
|
14 | 14 | use Magento\Framework\Setup\Option\TextConfigOption;
|
15 | 15 | use Magento\Setup\Validator\RedisConnectionValidator;
|
@@ -68,7 +68,8 @@ class PageCache implements ConfigOptionsListInterface
|
68 | 68 | self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT,
|
69 | 69 | self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
|
70 | 70 | self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA,
|
71 |
| - self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB, |
| 71 | + self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB => |
| 72 | + self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB, |
72 | 73 | ];
|
73 | 74 |
|
74 | 75 | /**
|
@@ -234,7 +235,7 @@ private function validateRedisConfig(array $options, DeploymentConfig $deploymen
|
234 | 235 | self::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE,
|
235 | 236 | $this->getDefaultConfigValue(self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE)
|
236 | 237 | );
|
237 |
| - |
| 238 | + |
238 | 239 | $config['password'] = isset($options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD])
|
239 | 240 | ? $options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD]
|
240 | 241 | : $deploymentConfig->get(
|
|
0 commit comments