fix(upgrade): skip stale patch directories and fix System module update URL (#17)

* fix(upgrade): skip stale patch directories and fix System module update URL

  Wrap patch file includes in buildUpgradeQueue() with try/catch so that
  stale directories from previous beta versions (e.g. upd_2.5.11-to-2.5.12
  from the pre-rename cycle) are logged and skipped instead of crashing the
  upgrade with a fatal "Class not found" error.

  Also fix double-encoding of the System module update URL at the end of
  the upgrade wizard — & in the PHP string was re-encoded by
  htmlspecialchars() in oneButtonContinueForm(), producing & which
  broke the query parameters.

* fix(upgrade): emit visible warnings for skipped patches and guard Db_manager loads

  Replace the undeclared $this->logs[] write in UpgradeControl::buildUpgradeQueue()
  with trigger_error(E_USER_WARNING) so that skipped patches produce a visible
  warning in the PHP error output instead of writing to a property that does not
  exist on the class.

  Also wrap the two method-level require_once calls for dbmanager.php inside
  upd-2.4.x-to-2.5.0 with class_exists('Db_manager', false) guards, matching the
  top-level guard, to prevent a fatal class redeclaration when the class was
  already loaded by an earlier patch in the upgrade queue.

Author: mambax7

upgrade/class/Xoops/Upgrade/UpgradeControl.php

@@ -228,7 +228,24 @@ public function buildUpgradeQueue(): bool
 
         foreach ($dirs as $dir) {
             if (str_contains($dir, '-to-')) {
-                $className = include $upgradeRoot . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . 'index.php';
+                $patchFile = $upgradeRoot . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . 'index.php';
+                if (!file_exists($patchFile)) {
+                    continue;
+                }
+                try {
+                    $className = include $patchFile;
+                } catch (\Throwable $e) {
+                    // Stale directories from a previous version (e.g.
+                    // upd_2.5.11-to-2.5.12 from the pre-rename beta cycle) can
+                    // fail to load because they reference classes that no longer
+                    // exist. Emit a visible warning and skip — crashing the
+                    // entire upgrade is worse than skipping one broken patch.
+                    trigger_error(
+                        sprintf('Upgrade patch %s could not be loaded: %s', $dir, $e->getMessage()),
+                        E_USER_WARNING
+                    );
+                    continue;
+                }
                 if (is_string($className) && class_exists($className)) {
                     $upg           = $this->createPatch($className);
                     $results[$dir] = $upg->isApplied();

upgrade/index.php

@@ -124,7 +124,7 @@
     }
     if (0 === $upgradeControl->countUpgradeQueue()) {
         echo $upgradeControl->oneButtonContinueForm(
-            XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=system',
+            XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=system',
             [],
         );
     } else {

upgrade/upd-2.4.x-to-2.5.0/index.php

@@ -12,7 +12,9 @@
 use Xoops\Upgrade\XoopsUpgrade;
 use Xoops\Upgrade\UpgradeControl;
 
-require_once __DIR__ . '/dbmanager.php';
+if (!class_exists('Db_manager', false)) {
+    require_once __DIR__ . '/dbmanager.php';
+}
 
 /**
  * Upgrade from 2.4.x to 2.5.0
@@ -79,11 +81,13 @@ public function check_templates(): bool
      */
     public function apply_config(): bool
     {
-        if (!file_exists($this->dbmanagerFile)) {
-            $this->logs[] = 'Database manager file not found: ' . $this->dbmanagerFile;
-            return false;
+        if (!class_exists('Db_manager', false)) {
+            if (!file_exists($this->dbmanagerFile)) {
+                $this->logs[] = 'Database manager file not found: ' . $this->dbmanagerFile;
+                return false;
+            }
+            require_once $this->dbmanagerFile;
         }
-        require_once $this->dbmanagerFile;
         $dbm = new Db_manager();
 
         $sql    = 'SELECT conf_id FROM `' . $this->db->prefix('config') . "` WHERE `conf_name` IN ('cpanel')";
@@ -197,11 +201,13 @@ public function apply_templates(): bool
             return false;
         }
 
-        if (!file_exists($this->dbmanagerFile)) {
-            $this->logs[] = 'Database manager file not found: ' . $this->dbmanagerFile;
-            return false;
+        if (!class_exists('Db_manager', false)) {
+            if (!file_exists($this->dbmanagerFile)) {
+                $this->logs[] = 'Database manager file not found: ' . $this->dbmanagerFile;
+                return false;
+            }
+            require_once $this->dbmanagerFile;
         }
-        require_once $this->dbmanagerFile;
         $dbm  = new Db_manager();
         $time = time();
         foreach ($modversion['templates'] as $tplfile) {

upgrade/upd_2.5.10-to-2.5.11/index.php

@@ -9,7 +9,9 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
-require_once XOOPS_ROOT_PATH . '/install/class/dbmanager.php';
+if (!class_exists('Db_manager', false)) {
+    require_once XOOPS_ROOT_PATH . '/install/class/dbmanager.php';
+}
 
 use Xmf\Database\Tables;
 use Xoops\Upgrade\XoopsUpgrade;