Try removing the online channel version from Configuration

PrestaShop · Jan 15, 2025 · f22cf1a · f22cf1a
1 parent f3df360
commit f22cf1a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 15 deletions.
diff --git a/classes/Commands/AbstractCommand.php b/classes/Commands/AbstractCommand.php
@@ -138,7 +138,6 @@ protected function loadConfiguration(?string $configPath): int
             return $controller->run();
         }
 
-
         return ExitCode::SUCCESS;
     }
 }
diff --git a/classes/Parameters/UpgradeConfiguration.php b/classes/Parameters/UpgradeConfiguration.php
@@ -49,7 +49,6 @@ class UpgradeConfiguration extends ArrayCollection
     const ARCHIVE_ZIP = 'archive_zip';
     const ARCHIVE_XML = 'archive_xml';
     const ARCHIVE_VERSION_NUM = 'archive_version_num';
-    const ONLINE_VERSION_NUM = 'online_version_num';
     const BACKUP_COMPLETED = 'backup_completed';
     const INSTALLED_LANGUAGES = 'installed_languages';
 
@@ -127,14 +126,6 @@ public function getLocalChannelVersion(): ?string
         return $this->get(self::ARCHIVE_VERSION_NUM);
     }
 
-    /**
-     * Get the cached version number of the online release.
-     */
-    public function getOnlineChannelVersion(): ?string
-    {
-        return $this->get(self::ONLINE_VERSION_NUM);
-    }
-
     /**
      * Get channel selected on config panel (Minor, major ...).
      *

diff --git a/classes/Upgrader.php b/classes/Upgrader.php
@@ -140,9 +140,6 @@ public function getDestinationVersion(): ?string
     {
         if ($this->updateConfiguration->isChannelLocal()) {
             return $this->updateConfiguration->getLocalChannelVersion();
-        } elseif ($this->updateConfiguration->getOnlineChannelVersion()) {
-            // Version of online channel has been cached? Return it.
-            return $this->updateConfiguration->getOnlineChannelVersion();
         } else {
             return $this->getOnlineDestinationRelease() ? $this->getOnlineDestinationRelease()->getVersion() : null;
         }

diff --git a/controllers/admin/AdminSelfUpgradeController.php b/controllers/admin/AdminSelfUpgradeController.php
@@ -297,7 +297,11 @@ public function init()
             empty($_REQUEST['params']) ? [] : $_REQUEST['params']
         );
 
+        // TODO: Can be removed when the old UI is not needed anymore
         if (!$this->upgradeContainer->getUpdateState()->isInitialized()) {
+            $this->upgradeContainer->getPrestaShopConfiguration()->fillInUpdateConfiguration(
+                $this->upgradeContainer->getUpdateConfiguration()
+            );
             $this->upgradeContainer->getUpdateState()->initDefault(
                 $this->upgradeContainer->getProperty(UpgradeContainer::PS_VERSION),
                 $this->upgradeContainer->getUpgrader(),

diff --git a/controllers/admin/self-managed/UpdatePageVersionChoiceController.php b/controllers/admin/self-managed/UpdatePageVersionChoiceController.php
@@ -193,8 +193,6 @@ public function save(): JsonResponse
                 $file = $requestConfig[UpgradeConfiguration::ARCHIVE_ZIP];
                 $fullFilePath = $this->upgradeContainer->getProperty(UpgradeContainer::DOWNLOAD_PATH) . DIRECTORY_SEPARATOR . $file;
                 $requestConfig[UpgradeConfiguration::ARCHIVE_VERSION_NUM] = $this->upgradeContainer->getPrestashopVersionService()->extractPrestashopVersionFromZip($fullFilePath);
-            } else {
-                $requestConfig[UpgradeConfiguration::ONLINE_VERSION_NUM] = $this->upgradeContainer->getUpgrader()->getDestinationVersion();
             }
 
             $configurationStorage = $this->upgradeContainer->getConfigurationStorage();
-Original file line number
+Diff line change
@@ Expand Up @@
                 return $controller->run();
             }
             return ExitCode::SUCCESS;
         }
     }