MAGECLOUD-1618: Temporary Workaround to Clean-up "disable_locking" Parameter (#161)

Author: billygilbert

src/Process/Deploy/InstallUpdate/ConfigUpdate/Redis.php

@@ -104,6 +104,11 @@ public function execute()
                     $redisSessionConfig
                 ),
             ];
+
+            if (isset($config['session']['redis']['disable_locking'])) {
+                $this->logger->info('Removing disable_locking env.php.');
+                unset($config['session']['redis']['disable_locking']);
+            }
         } else {
             $config = $this->removeRedisConfiguration($config);
         }

src/Test/Unit/Process/Deploy/InstallUpdate/ConfigUpdate/RedisTest.php

@@ -262,4 +262,75 @@ public function testExecuteWithDifferentRedisOptions()
 
         $this->process->execute();
     }
+
+    public function testRemoveDisableLocking()
+    {
+        $this->loggerMock->expects($this->exactly(2))
+            ->method('info')
+            ->withConsecutive(
+                [
+                    'Updating env.php Redis cache configuration.',
+                ],
+                [
+                    'Removing disable_locking env.php.'
+                ]
+            );
+        $this->environmentMock->expects($this->any())
+            ->method('getRelationships')
+            ->willReturn([
+                'redis' => [
+                    0 => [
+                        'host' => '127.0.0.1',
+                        'port' => '6379',
+                    ],
+                ],
+            ]);
+        $this->environmentMock->expects($this->any())
+            ->method('getAdminUrl')
+            ->willReturn('admin');
+        $this->configReaderMock->expects($this->once())
+            ->method('read')
+            ->willReturn([
+                'session' => [
+                    'redis' => [
+                        'disable_locking' => '1',
+                    ],
+                ],
+            ]);
+
+        $this->configWriterMock->expects($this->once())
+            ->method('write')
+            ->with([
+                'cache' => [
+                    'frontend' => [
+                        'default' => [
+                            'backend' => 'Cm_Cache_Backend_Redis',
+                            'backend_options' => [
+                                'server' => '127.0.0.1',
+                                'port' => '6379',
+                                'database' => 1,
+                            ],
+                        ],
+                        'page_cache' => [
+                            'backend' => 'Cm_Cache_Backend_Redis',
+                            'backend_options' => [
+                                'server' => '127.0.0.1',
+                                'port' => '6379',
+                                'database' => 1,
+                            ],
+                        ],
+                    ],
+                ],
+                'session' => [
+                    'save' => 'redis',
+                    'redis' => [
+                        'host' => '127.0.0.1',
+                        'port' => '6379',
+                        'database' => 0,
+                    ],
+                ],
+            ]);
+
+        $this->process->execute();
+    }
 }