Fix: move cache clear on end

Author: Volmarg

Diff for: installer/Controller/InstallerController.php

@@ -196,26 +196,6 @@ public static function configureAndPrepareSystem(): array
             return $resultData;
         }
 
-        InstallerLogger::addLogEntry("Started clearing cache");
-        {
-            $isCacheCleared = ShellBinConsoleService::clearCache();
-            $resultData[self::CONFIGURE_PREPARE_CLEAR_CACHE] = $isCacheCleared;
-        }
-        InstallerLogger::addLogEntry("Finished clearing cache", ["status" => $isCacheCleared]);
-        if(!$isCacheCleared){
-            return $resultData;
-        }
-
-        InstallerLogger::addLogEntry("Started building cache");
-        {
-            $isCacheBuilt = ShellBinConsoleService::buildCache();
-            $resultData[self::CONFIGURE_PREPARE_BUILD_CACHE] = $isCacheBuilt;
-        }
-        InstallerLogger::addLogEntry("Finished building cache", ["status" => $isCacheBuilt]);
-        if(!$isCacheBuilt){
-            return $resultData;
-        }
-
         InstallerLogger::addLogEntry("Started generating encryption key");
         {
             $generatedEncryptionKey = ShellBinConsoleService::generateEncryptionKey();
@@ -236,6 +216,26 @@ public static function configureAndPrepareSystem(): array
             return $resultData;
         }
 
+        InstallerLogger::addLogEntry("Started clearing cache");
+        {
+            $isCacheCleared = ShellBinConsoleService::clearCache();
+            $resultData[self::CONFIGURE_PREPARE_CLEAR_CACHE] = $isCacheCleared;
+        }
+        InstallerLogger::addLogEntry("Finished clearing cache", ["status" => $isCacheCleared]);
+        if(!$isCacheCleared){
+            return $resultData;
+        }
+
+        InstallerLogger::addLogEntry("Started building cache");
+        {
+            $isCacheBuilt = ShellBinConsoleService::buildCache();
+            $resultData[self::CONFIGURE_PREPARE_BUILD_CACHE] = $isCacheBuilt;
+        }
+        InstallerLogger::addLogEntry("Finished building cache", ["status" => $isCacheBuilt]);
+        if(!$isCacheBuilt){
+            return $resultData;
+        }
+
         InstallerLogger::addLogEntry("Now marking installation as finished");
         {
             self::setEnvKeyAppIsInstalled();