Skip to content

Commit a38f117

Browse files
dhorytskyidhorytskyi
committed
ACP2E-658: setup:config:set rewrites cache config in env.php
1 parent dbaba95 commit a38f117

File tree

2 files changed

+42
-38
lines changed

2 files changed

+42
-38
lines changed

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
*/
2222
class Cache implements ConfigOptionsListInterface
2323
{
24-
const INPUT_VALUE_CACHE_REDIS = 'redis';
25-
const CONFIG_VALUE_CACHE_REDIS = \Magento\Framework\Cache\Backend\Redis::class;
24+
public const INPUT_VALUE_CACHE_REDIS = 'redis';
25+
public const CONFIG_VALUE_CACHE_REDIS = \Magento\Framework\Cache\Backend\Redis::class;
2626

27-
const INPUT_KEY_CACHE_BACKEND = 'cache-backend';
28-
const INPUT_KEY_CACHE_BACKEND_REDIS_SERVER = 'cache-backend-redis-server';
29-
const INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE = 'cache-backend-redis-db';
30-
const INPUT_KEY_CACHE_BACKEND_REDIS_PORT = 'cache-backend-redis-port';
31-
const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
32-
const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'cache-backend-redis-compress-data';
33-
const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'cache-backend-redis-compression-lib';
34-
const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';
35-
const INPUT_KEY_CACHE_ALLOW_PARALLEL_CACHE_GENERATION = 'allow-parallel-generation';
27+
public const INPUT_KEY_CACHE_BACKEND = 'cache-backend';
28+
public const INPUT_KEY_CACHE_BACKEND_REDIS_SERVER = 'cache-backend-redis-server';
29+
public const INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE = 'cache-backend-redis-db';
30+
public const INPUT_KEY_CACHE_BACKEND_REDIS_PORT = 'cache-backend-redis-port';
31+
public const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
32+
public const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'cache-backend-redis-compress-data';
33+
public const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'cache-backend-redis-compression-lib';
34+
public const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';
35+
public const INPUT_KEY_CACHE_ALLOW_PARALLEL_CACHE_GENERATION = 'allow-parallel-generation';
3636

37-
const CONFIG_PATH_CACHE_BACKEND = 'cache/frontend/default/backend';
38-
const CONFIG_PATH_CACHE_BACKEND_SERVER = 'cache/frontend/default/backend_options/server';
39-
const CONFIG_PATH_CACHE_BACKEND_DATABASE = 'cache/frontend/default/backend_options/database';
40-
const CONFIG_PATH_CACHE_BACKEND_PORT = 'cache/frontend/default/backend_options/port';
41-
const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
42-
const CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/default/backend_options/compress_data';
43-
const CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB = 'cache/frontend/default/backend_options/compression_lib';
44-
const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';
45-
const CONFIG_PATH_ALLOW_PARALLEL_CACHE_GENERATION = 'cache/allow_parallel_generation';
37+
public const CONFIG_PATH_CACHE_BACKEND = 'cache/frontend/default/backend';
38+
public const CONFIG_PATH_CACHE_BACKEND_SERVER = 'cache/frontend/default/backend_options/server';
39+
public const CONFIG_PATH_CACHE_BACKEND_DATABASE = 'cache/frontend/default/backend_options/database';
40+
public const CONFIG_PATH_CACHE_BACKEND_PORT = 'cache/frontend/default/backend_options/port';
41+
public const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
42+
public const CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/default/backend_options/compress_data';
43+
public const CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB = 'cache/frontend/default/backend_options/compression_lib';
44+
public const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';
45+
public const CONFIG_PATH_ALLOW_PARALLEL_CACHE_GENERATION = 'cache/allow_parallel_generation';
4646

4747
/**
4848
* @var array
@@ -293,6 +293,7 @@ private function getDefaultConfigValue($inputKey)
293293
*/
294294
private function generateCachePrefix(): string
295295
{
296+
// phpcs:ignore Magento2.Functions.DiscouragedFunction
296297
return substr(\hash('sha256', dirname(__DIR__, 6)), 0, 3) . '_';
297298
}
298299
}

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

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,28 @@
1919
*/
2020
class PageCache implements ConfigOptionsListInterface
2121
{
22-
const INPUT_VALUE_PAGE_CACHE_REDIS = 'redis';
23-
const CONFIG_VALUE_PAGE_CACHE_REDIS = \Magento\Framework\Cache\Backend\Redis::class;
22+
public const INPUT_VALUE_PAGE_CACHE_REDIS = 'redis';
23+
public const CONFIG_VALUE_PAGE_CACHE_REDIS = \Magento\Framework\Cache\Backend\Redis::class;
2424

25-
const INPUT_KEY_PAGE_CACHE_BACKEND = 'page-cache';
26-
const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER = 'page-cache-redis-server';
27-
const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE = 'page-cache-redis-db';
28-
const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT = 'page-cache-redis-port';
29-
const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD = 'page-cache-redis-password';
30-
const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
31-
const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'page-cache-redis-compression-lib';
32-
const INPUT_KEY_PAGE_CACHE_ID_PREFIX = 'page-cache-id-prefix';
25+
public const INPUT_KEY_PAGE_CACHE_BACKEND = 'page-cache';
26+
public const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER = 'page-cache-redis-server';
27+
public const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE = 'page-cache-redis-db';
28+
public const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT = 'page-cache-redis-port';
29+
public const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD = 'page-cache-redis-password';
30+
public const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
31+
public const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'page-cache-redis-compression-lib';
32+
public const INPUT_KEY_PAGE_CACHE_ID_PREFIX = 'page-cache-id-prefix';
3333

34-
const CONFIG_PATH_PAGE_CACHE_BACKEND = 'cache/frontend/page_cache/backend';
35-
const CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER = 'cache/frontend/page_cache/backend_options/server';
36-
const CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE = 'cache/frontend/page_cache/backend_options/database';
37-
const CONFIG_PATH_PAGE_CACHE_BACKEND_PORT = 'cache/frontend/page_cache/backend_options/port';
38-
const CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD = 'cache/frontend/page_cache/backend_options/password';
39-
const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/page_cache/backend_options/compress_data';
40-
const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB = 'cache/frontend/page_cache/backend_options/compression_lib';
41-
const CONFIG_PATH_PAGE_CACHE_ID_PREFIX = 'cache/frontend/page_cache/id_prefix';
34+
public const CONFIG_PATH_PAGE_CACHE_BACKEND = 'cache/frontend/page_cache/backend';
35+
public const CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER = 'cache/frontend/page_cache/backend_options/server';
36+
public const CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE = 'cache/frontend/page_cache/backend_options/database';
37+
public const CONFIG_PATH_PAGE_CACHE_BACKEND_PORT = 'cache/frontend/page_cache/backend_options/port';
38+
public const CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD = 'cache/frontend/page_cache/backend_options/password';
39+
public const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA =
40+
'cache/frontend/page_cache/backend_options/compress_data';
41+
public const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB =
42+
'cache/frontend/page_cache/backend_options/compression_lib';
43+
public const CONFIG_PATH_PAGE_CACHE_ID_PREFIX = 'cache/frontend/page_cache/id_prefix';
4244

4345
/**
4446
* @var array
@@ -284,6 +286,7 @@ private function getDefaultConfigValue($inputKey)
284286
*/
285287
private function generateCachePrefix(): string
286288
{
289+
// phpcs:ignore Magento2.Functions.DiscouragedFunction
287290
return substr(\hash('sha256', dirname(__DIR__, 6)), 0, 3) . '_';
288291
}
289292
}

0 commit comments

Comments
 (0)