review changes

Author: ashvini22326

src/Config/Factory/Cache.php

@@ -151,37 +151,37 @@ public function get(): array
          $envCacheBackendModel = (string)$this->stageConfig->get(DeployInterface::VAR_CACHE_REDIS_BACKEND);
 
         if ($this->isSynchronizedConfigStructure()) {
-            $cacheCache = $this->getSynchronizedConfigStructure($envCacheBackendModel, $backendConfig);
-            $cacheCache['backend_options']['remote_backend_options'] = array_merge(
-                $cacheCache['backend_options']['remote_backend_options'],
-                $this->getSlaveConnection($envCacheConfiguration, $backendConfig)
-            );
+               $cacheCacheBackend = $this->getSynchronizedConfigStructure($envCacheBackendModel, $backendConfig);
+                $cacheCacheBackend['backend_options']['remote_backend_options'] = array_merge(
+                    $cacheCacheBackend['backend_options']['remote_backend_options'],
+                    $this->getSlaveConnection($envCacheConfiguration, $backendConfig)
+                );
             $finalConfig = [
                 'frontend' => [
-                    'default' => $cacheCache,
+                    'default' => $cacheCacheBackend,
                 ],
                 'type' => [
                     'default' => ['frontend' => 'default'],
                 ],
             ];
         } else {
-            $cacheCache = $this->getUnsyncedConfigStructure($envCacheBackendModel, $backendConfig);
+            $cacheCacheBackend = $this->getUnsyncedConfigStructure($envCacheBackendModel, $backendConfig);
             $slaveConnection = $this->getSlaveConnection($envCacheConfiguration, $backendConfig);
             if ($slaveConnection) {
-                $cacheCache['frontend_options']['write_control'] = false;
-                $cacheCache['backend_options'] = array_merge(
-                    $cacheCache['backend_options'],
-                    $slaveConnection
-                );
+                  $cacheCacheBackend['frontend_options']['write_control'] = false;
+                  $cacheCacheBackend['backend_options'] = array_merge(
+                      $cacheCacheBackend['backend_options'],
+                      $slaveConnection
+                  );
             }
             $finalConfig = [
                 'frontend' => [
                     'default' => array_replace_recursive(
-                        $cacheCache,
+                        $cacheCacheBackend,
                         ['backend_options' => ['database' => self::CACHE_DATABASE_DEFAULT]]
                     ),
                     'page_cache' => array_replace_recursive(
-                        $cacheCache,
+                        $cacheCacheBackend,
                         ['backend_options' => ['database' => self::CACHE_DATABASE_PAGE_CACHE]]
                     ),
                 ]

src/Step/Deploy/InstallUpdate/ConfigUpdate/Session/Config.php

@@ -41,12 +41,12 @@ class Config
     /**
      * @var Valkey
      */
-    private $valkey;
+    private Valkey $valkey;
 
     /**
      * @var ValkeySession
      */
-    private $valkeySession;
+    private ValkeySession $valkeySession;
 
     /**
      * @var DeployInterface

src/Step/Deploy/PreDeploy/ConfigUpdate/Cache.php

@@ -125,7 +125,7 @@ public function execute()
                 $this->logger->info('Cache configuration was not found. Removing cache configuration.');
                 unset($config['cache']);
             } elseif (empty($cacheConfig['frontend'])) {
-                  $isRedisConfigured = !empty($cacheConfig['frontend']['default']['_custom_redis_backend']);
+                   $isRedisConfigured = !empty($cacheConfig['frontend']['default']['_custom_redis_backend']);
                    $isValkeyConfigured = !empty($cacheConfig['frontend']['default']['_custom_valkey_backend']);
                 if ($isRedisConfigured) {
                         $this->logger->warning(

src/Test/Unit/Service/EolValidatorTest.php

@@ -172,12 +172,12 @@ public function testValidateServiceEol()
         $service6->expects($this->once())
             ->method('getVersion')
             ->willReturn('10.2');
-      $service7 = $this->createMock(ServiceInterface::class);
-      $service7->expects($this->once())
+        $service7 = $this->createMock(ServiceInterface::class);
+        $service7->expects($this->once())
         ->method('getVersion')
         ->willReturn('8.0');
-      $service8 = $this->createMock(ServiceInterface::class);
-      $service8->expects($this->once())
+        $service8 = $this->createMock(ServiceInterface::class);
+        $service8->expects($this->once())
         ->method('getVersion')
         ->willReturn('8.0');
         // withConsecutive() alternative.