Skip to content

N°7071 - Remove CMDBSource::MYSQL_DEFAULT_PORT #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Timmy38 merged 1 commit into from
Sep 19, 2025
Merged

N°7071 - Remove CMDBSource::MYSQL_DEFAULT_PORT #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions core/cmdbsource.class.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -220,7 +215,7 @@ public static function GetMysqliInstance(
* @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)
*/
Expand Down
2 changes: 1 addition & 1 deletion setup/backup.class.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ private static function GetMysqlCliPortAndTransportOptions(string $sHost, ?int $
}

if (is_null($iPort)) {
$iPort = CMDBSource::MYSQL_DEFAULT_PORT;
return '';
}
$sPortOption = self::GetMysqliCliSingleOption('port', $iPort);

Expand Down
8 changes: 4 additions & 4 deletions tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,16 @@ public function GetMysqlCliPortAndTransportOptionsProvider()
'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, ''],
];
}
Expand Down