diff --git a/.travis.yml b/.travis.yml index 9243e35fcce..b18b85918fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,6 +91,7 @@ before_install: sudo apt-get install -y pgloader memcached if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then sudo apt install unzip apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1 + sudo apt install mariadb-server mariadb-client fi if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then sudo apt install unzip apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1 @@ -285,11 +286,11 @@ before_script: echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_port=\'3306\'';' >> $CONF_FILE + echo '$'dolibarr_main_db_port=3306';' >> $CONF_FILE fi if [ "$DB" = 'postgresql' ]; then echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE + echo '$'dolibarr_main_db_port=5432';' >> $CONF_FILE fi echo '$'dolibarr_main_db_port=\'password\'';' >> $CONF_FILE echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE diff --git a/htdocs/core/lib/phpsessionindb.lib.php b/htdocs/core/lib/phpsessionindb.lib.php index 0af40522bfc..f38123e2a7c 100644 --- a/htdocs/core/lib/phpsessionindb.lib.php +++ b/htdocs/core/lib/phpsessionindb.lib.php @@ -51,7 +51,7 @@ function dolSessionOpen($save_path, $session_name) if (empty($dolibarr_session_db_port)) { $dolibarr_session_db_port = $dolibarr_main_db_port; } //var_dump('open '.$database_name.' '.$table_name); - $dbsession = getDoliDBInstance($dolibarr_session_db_type, $dolibarr_session_db_host, $dolibarr_session_db_user, $dolibarr_session_db_pass, $dolibarr_session_db_name, $dolibarr_session_db_port); + $dbsession = getDoliDBInstance($dolibarr_session_db_type, $dolibarr_session_db_host, $dolibarr_session_db_user, $dolibarr_session_db_pass, $dolibarr_session_db_name, (int) $dolibarr_session_db_port); return true; } diff --git a/htdocs/install/check.php b/htdocs/install/check.php index baa6eb44c72..ec78b5d38cd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -360,7 +360,7 @@ if (!file_exists($conffile)) { $conf->db->name = $dolibarr_main_db_name; $conf->db->user = $dolibarr_main_db_user; $conf->db->pass = $dolibarr_main_db_pass; - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); if ($db->connected && $db->database_selected) { $ok = true; } diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 6dacbbbc705..5f09b20bb3d 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -128,7 +128,7 @@ $conf->db->pass = $dolibarr_main_db_pass; $conf->db->dolibarr_main_db_encryption = isset($dolibarr_main_db_encryption) ? $dolibarr_main_db_encryption : ''; $conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey) ? $dolibarr_main_db_cryptkey : ''; -$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); +$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); if ($db->connected) { print ''; diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php index 4df1370570a..61139927e17 100644 --- a/htdocs/install/step1.php +++ b/htdocs/install/step1.php @@ -240,7 +240,7 @@ if (!$error) { } } - $db = getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port); + $db = getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, (int) $db_port); dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG); //print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected; @@ -272,7 +272,7 @@ if (!$error) { // If we need simple access if (!$error && (empty($db_create_database) && empty($db_create_user))) { - $db = getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port); + $db = getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, (int) $db_port); if ($db->error) { print '
'.$db->error.'
'; @@ -529,7 +529,7 @@ if (!$error && $db->connected && $action == "set") { // Check database connection - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, $conf->db->port); + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, (int) $conf->db->port); if ($db->error) { print '
'.$db->error.'
'; @@ -611,7 +611,7 @@ if (!$error && $db->connected && $action == "set") { // If database creation was asked, we create it if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) { dolibarr_install_syslog("step1: create database: ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user); - $newdb = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, '', $conf->db->port); + $newdb = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, '', (int) $conf->db->port); //print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit; if ($newdb->connected) { @@ -671,7 +671,7 @@ if (!$error && $db->connected && $action == "set") { dolibarr_install_syslog("step1: connection type=".$conf->db->type." on host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name); //print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name; - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); if ($db->connected) { dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." ok"); diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php index 4569f917dec..a06408bd32c 100644 --- a/htdocs/install/step2.php +++ b/htdocs/install/step2.php @@ -109,7 +109,7 @@ if ($action == "set") { print ''; $error = 0; - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); if ($db->connected) { print "
"; diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php index 1b179cf98ab..3feb55fd63a 100644 --- a/htdocs/install/step4.php +++ b/htdocs/install/step4.php @@ -76,7 +76,7 @@ print $langs->trans("LastStepDesc").'

'; print ''; -$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); +$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); if ($db->ok) { print ''; diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php index 0bb2efa47cb..fc6a5aaea04 100644 --- a/htdocs/mailmanspip/class/mailmanspip.class.php +++ b/htdocs/mailmanspip/class/mailmanspip.class.php @@ -105,7 +105,7 @@ class MailmanSpip */ public function connectSpip() { - $resource = getDoliDBInstance('mysql', getDolGlobalString('ADHERENT_SPIP_SERVEUR'), getDolGlobalString('ADHERENT_SPIP_USER'), getDolGlobalString('ADHERENT_SPIP_PASS'), getDolGlobalString('ADHERENT_SPIP_DB'), getDolGlobalString('ADHERENT_SPIP_PORT')); + $resource = getDoliDBInstance('mysql', getDolGlobalString('ADHERENT_SPIP_SERVEUR'), getDolGlobalString('ADHERENT_SPIP_USER'), getDolGlobalString('ADHERENT_SPIP_PASS'), getDolGlobalString('ADHERENT_SPIP_DB'), getDolGlobalInt('ADHERENT_SPIP_PORT')); if ($resource->ok) { return $resource; diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 17fcc123a2b..50a03e6fdb3 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -137,7 +137,7 @@ if (!defined('NOREQUIRETRAN')) { */ $db = null; if (!defined('NOREQUIREDB')) { - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); if ($db->error) { // If we were into a website context
'; diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php index 40e1c1b799e..87d017b7fd0 100644 --- a/htdocs/install/step5.php +++ b/htdocs/install/step5.php @@ -160,7 +160,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) { $conf->db->dolibarr_main_db_encryption = isset($dolibarr_main_db_encryption) ? $dolibarr_main_db_encryption : ''; $conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey) ? $dolibarr_main_db_cryptkey : ''; - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); // Create the global $hookmanager object include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 1cccc3cc129..4c9045c719f 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -147,7 +147,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ } $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey; - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); // Create the global $hookmanager object include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 4c1ff0e33b5..1dc5c7337d4 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -144,7 +144,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ $conf->db->user = $dolibarr_main_db_user; $conf->db->pass = $dolibarr_main_db_pass; - $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port); + $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port); if (!$db->connected) { print '
'.$langs->trans("ErrorFailedToConnectToDatabase", $conf->db->name).''.$langs->trans('Error').'