Merge pull request #8764 from magento-gl/Hammer-2.4.7-Beta3-Delivery-16Feb

Hammer 2.4.7 delivery 16 feb

Author: sidolov

composer.json

@@ -36,8 +36,8 @@
         "ext-zip": "*",
         "lib-libxml": "*",
         "colinmollenhour/cache-backend-file": "^1.4",
-        "colinmollenhour/cache-backend-redis": "~1.16.0",
-        "colinmollenhour/credis": "~1.15.0",
+        "colinmollenhour/cache-backend-redis": "^1.16",
+        "colinmollenhour/credis": "^1.15",
         "colinmollenhour/php-redis-session-abstract": "^1.5",
         "composer/composer": "^2.0, !=2.2.16",
         "elasticsearch/elasticsearch": "~7.17.0 || ~8.5.0",
@@ -101,7 +101,7 @@
         "magento/magento2-functional-testing-framework": "^4.7",
         "pdepend/pdepend": "^2.10",
         "phpmd/phpmd": "^2.12",
-        "phpstan/phpstan": "^1.9, <1.10.29",
+        "phpstan/phpstan": "^1.9",
         "phpunit/phpunit": "^9.5",
         "sebastian/phpcpd": "^6.0",
         "symfony/finder": "^6.4"

composer.lock

@@ -31,6 +31,8 @@ class Cache implements ConfigOptionsListInterface
     public const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
     public const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'cache-backend-redis-compress-data';
     public const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'cache-backend-redis-compression-lib';
+    public const INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY = 'cache-backend-redis-lua-key';
+    public const INPUT_KEY_CACHE_BACKEND_REDIS_USE_LUA = 'cache-backend-redis-use-lua';
     public const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';
     public const INPUT_KEY_CACHE_ALLOW_PARALLEL_CACHE_GENERATION = 'allow-parallel-generation';
 
@@ -41,6 +43,8 @@ class Cache implements ConfigOptionsListInterface
     public const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
     public const CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/default/backend_options/compress_data';
     public const CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB = 'cache/frontend/default/backend_options/compression_lib';
+    public const CONFIG_PATH_CACHE_BACKEND_LUA_KEY = 'cache/frontend/default/backend_options/_useLua';
+    public const CONFIG_PATH_CACHE_BACKEND_USE_LUA = 'cache/frontend/default/backend_options/use_lua';
     public const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';
     public const CONFIG_PATH_ALLOW_PARALLEL_CACHE_GENERATION = 'cache/allow_parallel_generation';
 
@@ -55,6 +59,8 @@ class Cache implements ConfigOptionsListInterface
         self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => '1',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB => '',
         self::INPUT_KEY_CACHE_ALLOW_PARALLEL_CACHE_GENERATION => 'false',
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY => true,
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_USE_LUA => false
     ];
 
     /**
@@ -75,6 +81,8 @@ class Cache implements ConfigOptionsListInterface
         self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA,
         self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB => self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB,
         self::INPUT_KEY_CACHE_ALLOW_PARALLEL_CACHE_GENERATION => self::CONFIG_PATH_ALLOW_PARALLEL_CACHE_GENERATION,
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY => self::CONFIG_PATH_CACHE_BACKEND_LUA_KEY,
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_USE_LUA => self::CONFIG_PATH_CACHE_BACKEND_USE_LUA,
     ];
 
     /**
@@ -141,6 +149,12 @@ public function getOptions()
                 self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB,
                 'Compression lib to use [snappy,lzf,l4z,zstd,gzip] (leave blank to determine automatically)'
             ),
+            new TextConfigOption(
+                self::INPUT_KEY_CACHE_BACKEND_REDIS_USE_LUA,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_CACHE_BACKEND_USE_LUA,
+                'Set to 1 to enable lua (default is 0, disabled)'
+            ),
             new TextConfigOption(
                 self::INPUT_KEY_CACHE_ID_PREFIX,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
@@ -252,6 +266,20 @@ private function validateRedisConfig(array $options, DeploymentConfig $deploymen
                 $this->getDefaultConfigValue(self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD)
             );
 
+        $config['_useLua'] = isset($options[self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY])
+            ? $options[self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY]
+            : $deploymentConfig->get(
+                self::CONFIG_PATH_CACHE_BACKEND_LUA_KEY,
+                $this->getDefaultConfigValue(self::CONFIG_PATH_CACHE_BACKEND_LUA_KEY)
+            );
+
+        $config['use_lua'] = isset($options[self::INPUT_KEY_CACHE_BACKEND_REDIS_USE_LUA])
+            ? $options[self::INPUT_KEY_CACHE_BACKEND_REDIS_USE_LUA]
+            : $deploymentConfig->get(
+                self::CONFIG_PATH_CACHE_BACKEND_USE_LUA,
+                $this->getDefaultConfigValue(self::CONFIG_PATH_CACHE_BACKEND_USE_LUA)
+            );
+
         return $this->redisValidator->isValidConnection($config);
     }
 

lib/web/moment.js

@@ -49,7 +49,7 @@ protected function setUp(): void
     public function testGetOptions()
     {
         $options = $this->configOptionsList->getOptions();
-        $this->assertCount(9, $options);
+        $this->assertCount(10, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -81,11 +81,15 @@ public function testGetOptions()
 
         $this->assertArrayHasKey(7, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[7]);
-        $this->assertEquals('cache-id-prefix', $options[7]->getName());
+        $this->assertEquals('cache-backend-redis-use-lua', $options[7]->getName());
 
         $this->assertArrayHasKey(8, $options);
-        $this->assertInstanceOf(FlagConfigOption::class, $options[8]);
-        $this->assertEquals('allow-parallel-generation', $options[8]->getName());
+        $this->assertInstanceOf(TextConfigOption::class, $options[8]);
+        $this->assertEquals('cache-id-prefix', $options[8]->getName());
+
+        $this->assertArrayHasKey(9, $options);
+        $this->assertInstanceOf(FlagConfigOption::class, $options[9]);
+        $this->assertEquals('allow-parallel-generation', $options[9]->getName());
     }
 
     /**
@@ -107,6 +111,8 @@ public function testCreateConfigCacheRedis()
                             'password' => '',
                             'compress_data' => '',
                             'compression_lib' => '',
+                            '_useLua' => '',
+                            'use_lua' => ''
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
@@ -158,6 +164,8 @@ public function testCreateConfigWithRedisConfig()
                             'password' => '',
                             'compress_data' => '1',
                             'compression_lib' => 'gzip',
+                            '_useLua' => null,
+                            'use_lua' => null
                         ],
                     ]
                 ],
@@ -238,7 +246,14 @@ public function testValidateWithValidInput()
         ];
         $this->validatorMock->expects($this->once())
             ->method('isValidConnection')
-            ->with(['host' => 'localhost', 'db' => '', 'port' => '', 'password' => ''])
+            ->with([
+                'host' => 'localhost',
+                'db' => '',
+                'port' => '',
+                'password' => '',
+                '_useLua' => null,
+                'use_lua' => null
+            ])
             ->willReturn(true);
 
         $errors = $this->configOptionsList->validate($options, $this->deploymentConfigMock);