diff --git a/setup/backup.class.inc.php b/setup/backup.class.inc.php index 1720502d1..854c7594b 100644 --- a/setup/backup.class.inc.php +++ b/setup/backup.class.inc.php @@ -469,6 +469,7 @@ EOF; * @uses \CMDBSource::GetDBVersion() so needs a connection opened ! * * @since 2.5.0 N°1260 + * @since 2.6.2 2.7.0 N°2336 Call DB to get vendor and version (so CMDBSource must be init before calling this method) * @link https://dev.mysql.com/doc/refman/5.6/en/connection-options.html#encrypted-connection-options "Command Options for Encrypted Connections" */ public static function GetMysqlCliTlsOptions($oConfig) diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist index 62e9da8be..da50db77f 100644 --- a/test/phpunit.xml.dist +++ b/test/phpunit.xml.dist @@ -40,55 +40,57 @@ timeoutForLargeTests="60" verbose="false"> - - - ../env-production/*/test - - - core - - - webservices - - - itop-tickets - - - itop-config - - - application - - - - sources - - - status - - - synchro - - - setup - - - integration - - - coreExtensions - - + + + application + + + core + + + coreExtensions + + + integration + + + itop-config + + + itop-tickets + + + + + setup + + + sources + + + status + + + synchro + + + webservices + - - - - ../core/apc-emulation.php - ../core/ormlinkset.class.inc.php - ../datamodels/2.x/itop-tickets/main.itop-tickets.php - - + + ../env-production/*/test + + + + + + + ../core/apc-emulation.php + ../core/ormlinkset.class.inc.php + ../datamodels/2.x/itop-tickets/main.itop-tickets.php + +