composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°7071 - Remove CMDBSource::MYSQL_DEFAULT_PORT

Browse Source
This commit is contained in:
Timmy38
2025-09-19 10:53:58 +02:00
committed by GitHub
parent edbe4974ac
commit 6be9255ca0
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/cmdbsource.class.inc.php
View File

@@ -42,11 +42,6 @@ class CMDBSource
const ENUM_DB_VENDOR_MARIADB = 'MariaDB';
const ENUM_DB_VENDOR_PERCONA = 'Percona';
/**
* @since 2.7.10 3.0.4 3.1.2 3.0.2 N°6889 constant creation
* @internal will be removed in a future version
*/
const MYSQL_DEFAULT_PORT = 3306;
/**
* Error: 1205 SQLSTATE: HY000 (ER_LOCK_WAIT_TIMEOUT)
@@ -220,7 +215,7 @@ class CMDBSource
* @param string $sServer server variable to update
* @param int|null $iPort port variable to update, will return null if nothing is specified in $sDbHost
*
* @since 2.7.10 3.0.4 3.1.2 3.2.0 N°6889 will return null in $iPort if port isn't present in $sDbHost. Use {@see MYSQL_DEFAULT_PORT} if needed
* @since 2.7.10 3.0.4 3.1.2 3.2.0 N°6889 will return null in $iPort if port isn't present in $sDbHost.
*
* @link http://php.net/manual/en/mysqli.persistconns.php documentation for the "p:" prefix (persistent connexion)
*/

2
setup/backup.class.inc.php
View File

@@ -617,7 +617,7 @@ EOF;
}
if (is_null($iPort)) {
$iPort = CMDBSource::MYSQL_DEFAULT_PORT;
return '';
}
$sPortOption = self::GetMysqliCliSingleOption('port', $iPort);

8
tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
View File

@@ -130,16 +130,16 @@ class DBBackupTest extends ItopTestCase
'Localhost with port' => ['localhost', $iTestPort, $iTestPort, ' --protocol=tcp'],
// we want both port and protocol for 127.0.0.1, because it is an ip address so using tcp/ip stack !
'127.0.0.1 no port' => ['127.0.0.1', null, $iDefaultPort, ''],
'127.0.0.1 no port' => ['127.0.0.1', null, null, ''],
'127.0.0.1 with port' => ['127.0.0.1', $iTestPort, $iTestPort, ''],
'IP no port' => ['192.168.1.15', null, $iDefaultPort, ''],
'IP no port' => ['192.168.1.15', null, null, ''],
'IP with port' => ['192.168.1.15', $iTestPort, $iTestPort, ''],
'DNS no port' => ['dbserver.mycompany.com', null, $iDefaultPort, ''],
'DNS no port' => ['dbserver.mycompany.com', null, null, ''],
'DNS with port' => ['dbserver.mycompany.com', $iTestPort, $iTestPort, ''],
'Windows name no port' => ['dbserver', null, $iDefaultPort, ''],
'Windows name no port' => ['dbserver', null, null, ''],
'Windows name with port' => ['dbserver', $iTestPort, $iTestPort, ''],
];
}