N°4215 Fix call to a function on null error when setting TLS connection in the setup

Regression introduced by b1ca1f2630 / N°3513
This commit is contained in:
Pierre Goiffon
2021-09-22 14:38:23 +02:00
parent da217a1cb3
commit aaa8f6d311
2 changed files with 28 additions and 2 deletions

View File

@@ -154,6 +154,12 @@ class CMDBSource
/** @var mysqli $m_oMysqli */
protected static $m_oMysqli;
/**
* @var mysqli $oMySQLiForQuery
* @see GetMySQLiForQuery
* @see SetMySQLiForQuery
* @since 2.7.5 N°3513 new var to allow mock in tests ({@see \Combodo\iTop\Test\UnitTest\Core\TransactionsTest})
*/
protected static $oMySQLiForQuery;
/**
@@ -348,9 +354,9 @@ class CMDBSource
*/
private static function IsOpenedDbConnectionUsingTls($oMysqli)
{
if (self::$m_oMysqli == null)
if (is_null(self::GetMySQLiForQuery()))
{
self::$m_oMysqli = $oMysqli;
self::SetMySQLiForQuery($oMysqli);
}
$bNonEmptySslVersionVar = self::IsMySqlVarNonEmpty('ssl_version');