Merge remote-tracking branch 'local/ACP2E-1604' into PR_7_JAN_2023

Author: o-dubovyk

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

@@ -316,9 +316,10 @@ private function setDefaultConfiguration(
         string $lockProvider
     ) {
         foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
-            // do not set default value null for lock db prefix
-            if ($input !== self::INPUT_KEY_LOCK_DB_PREFIX) {
-                $configData->set($path, $deploymentConfig->get($path, $this->getDefaultValue($input)));
+            // do not set default value null for lock db prefix, but save current value if it exists
+            $defaultValue = $deploymentConfig->get($path, $this->getDefaultValue($input));
+            if (($input !== self::INPUT_KEY_LOCK_DB_PREFIX) || ($defaultValue !== null)) {
+                $configData->set($path, $defaultValue);
             }
         }
 

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

@@ -194,6 +194,102 @@ public function createConfigDataProvider(): array
         ];
     }
 
+    /**
+     * @param array $options
+     * @param array $expectedResult
+     * @dataProvider updateConfigDataProvider
+     */
+    public function testUpdateConfig(array $options, array $expectedResult)
+    {
+        $valueMap = [
+            [ 'lock/config/prefix', null, 'saved_prefix' ],
+            [ 'lock/provider', 'db', 'db' ]
+        ];
+        $this->deploymentConfigMock
+            ->expects($this->any())
+            ->method('get')
+            ->willReturnMap($valueMap);
+        $data = $this->lockConfigOptionsList->createConfig($options, $this->deploymentConfigMock);
+        $this->assertInstanceOf(ConfigData::class, $data);
+        $this->assertTrue($data->isOverrideWhenSave());
+        $this->assertSame($expectedResult, $data->getData());
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function updateConfigDataProvider(): array
+    {
+        return [
+            'Check existent value for lock-db-prefix is not erased with no parameter specified' => [
+                'options' => [],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => 'saved_prefix',
+                        ],
+                    ],
+                ],
+            ],
+            'Check lock-db-prefix options overrides existing value when parameter is specified' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX => 'new_prefix'
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => 'new_prefix',
+                        ],
+                    ],
+                ],
+            ],
+            'Check lock-db-prefix options overrides existing value when only this parameter is specified' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX => 'new_prefix'
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => 'new_prefix',
+                        ],
+                    ],
+                ],
+            ],
+            'Check that lock-db-prefix value is not erased when when only lock-provider is specified as db' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => 'saved_prefix',
+                        ],
+                    ],
+                ],
+            ],
+            'Check specific db lock prefix empty options overrides existing value' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX => ''
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => '',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
     /**
      * @param array $options
      * @param array $expectedResult