From a798501af32309e43601bbb60934bf700c826e7f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 5 Feb 2026 03:56:54 +0100 Subject: [PATCH] Fix CI --- htdocs/install/upgrade.php | 17 ++++++++++------- htdocs/product/admin/product.php | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index e16eb5acb18..453d48bda64 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -65,6 +65,9 @@ require_once $conffile; * @var string $dolibarr_main_db_cryptkey * @var string $dolibarr_main_document_root */ +' +@phan-var-force string $dolibarr_main_db_type +'; require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php'; global $langs; @@ -143,12 +146,12 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ } // $conf is already instantiated inside inc.php - $conf->db->type = $dolibarr_main_db_type; - $conf->db->host = $dolibarr_main_db_host; - $conf->db->port = $dolibarr_main_db_port; - $conf->db->name = $dolibarr_main_db_name; - $conf->db->user = $dolibarr_main_db_user; - $conf->db->pass = $dolibarr_main_db_pass; + $conf->db->type = (string) $dolibarr_main_db_type; + $conf->db->host = (string) $dolibarr_main_db_host; + $conf->db->port = (string) $dolibarr_main_db_port; + $conf->db->name = (string) $dolibarr_main_db_name; + $conf->db->user = (string) $dolibarr_main_db_user; + $conf->db->pass = (string) $dolibarr_main_db_pass; // Load type and crypt key if (empty($dolibarr_main_db_encryption)) { @@ -268,7 +271,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ && versioncompare($versioncommande, $versionarray) <= 0) { // Si mysql >= 4.0 dolibarr_install_syslog("Clean database from bad named constraints"); - // Suppression vieilles contraintes sans noms et en doubles + // Remove old constraints without name and duplicated // Les contraintes indesirables ont un nom qui commence par 0_ ou se determine par ibfk_999 $listtables = array( MAIN_DB_PREFIX.'adherent_options', diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 6c28c9bd85b..a8f2486fc0f 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -211,8 +211,8 @@ if ($action == 'specimen') { // For products header("Location: ".DOL_URL_ROOT."/document.php?modulepart=product&file=SPECIMEN.pdf"); return; } else { - setEventMessages($obj->error, $obj->errors, 'errors'); - dol_syslog($obj->error, LOG_ERR); + setEventMessages($module->error, $module->errors, 'errors'); + dol_syslog($module->error, LOG_ERR); } } else { setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');