Merge remote-tracking branch 'origin/support/2.7' into support/3.0

# Conflicts:
#	core/cmdbsource.class.inc.php
#	core/log.class.inc.php
#	test/setup/iTopDesignFormat/iTopDesignFormatTest.php

core/cmdbsource.class.inc.php

@@ -350,6 +350,12 @@ class CMDBSource
 
 	}
 
+	/**
+	 * @return string
+	 * @throws \MySQLException
+	 *
+	 * @uses \CMDBSource::QueryToCol() so needs a connection opened !
+	 */
 	public static function GetDBVersion()
 	{
 		$aVersions = self::QueryToCol('SELECT Version() as version', 'version');
@@ -367,8 +373,10 @@ class CMDBSource
 	/**
 	 * Get the DB vendor between MySQL and its main forks
 	 * @return string
+	 *
+	 * @uses \CMDBSource::GetServerVariable() so needs a connection opened !
 	 */
-	static public function GetDBVendor()
+	public static function GetDBVendor()
 	{
 		$sDBVendor = static::ENUM_DB_VENDOR_MYSQL;
 		

setup/backup.class.inc.php

@@ -254,7 +254,7 @@ class DBBackup
 		return $aRet;
 	}
 
-	protected static function EscapeShellArg($sValue)
+	public static function EscapeShellArg($sValue)
 	{
 		// Note: See comment from the 23-Apr-2004 03:30 in the PHP documentation
 		//    It suggests to rely on pctnl_* function instead of using escapeshellargs
@@ -461,13 +461,15 @@ EOF;
 
 
 	/**
-	 * @see https://dev.mysql.com/doc/refman/5.6/en/encrypted-connection-options.html
-	 *
 	 * @param Config $oConfig
 	 *
 	 * @return string TLS arguments for CLI programs such as mysqldump. Empty string if the config does not use TLS.
 	 *
-	 * @since 2.5.0
+	 * @uses \CMDBSource::GetDBVendor() so needs a connection opened !
+	 * @uses \CMDBSource::GetDBVersion() so needs a connection opened !
+	 *
+	 * @since 2.5.0 N°1260
+	 * @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)
 	{

test/ItopDataTestCase.php

@@ -56,9 +56,16 @@ define('TAG_CLASS', 'FAQ');
 define('TAG_ATTCODE', 'domains');
 
 /**
+ * Helper class to extend for tests needing access to iTop's metamodel
+ *
+ * **⚠ Warning** Each class extending this one needs to add the following annotations :
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
+ *
+ * @since 2.7.7 3.0.1 3.1.0 N°4624 processIsolation is disabled by default and must be enabled in each test needing it (basically all tests using
+ * iTop datamodel)
  */
 class ItopDataTestCase extends ItopTestCase
 {

test/itop-config/Validator/iTopConfigSyntaxValidatorTest.php

@@ -13,7 +13,7 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use PhpParser\Node;
 use PhpParser\PrettyPrinter\Standard;
 
-class iTopConfigAstValidatorTest extends ItopTestCase
+class iTopConfigSyntaxValidatorTest extends ItopTestCase
 {
 
 	public function setUp()

test/phpunit.xml.dist

@@ -19,7 +19,7 @@
 <phpunit bootstrap="unittestautoload.php"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
-         backupGlobals="false"
+         backupGlobals="true"
          backupStaticAttributes="false"
          cacheTokens="false"
          colors="true"
@@ -53,6 +53,9 @@
         <testsuite name="Tickets">
             <directory>itop-tickets</directory>
         </testsuite>
+        <testsuite name="Config">
+          <directory>itop-config</directory>
+        </testsuite>
         <testsuite name="Application">
             <directory>application</directory>
         </testsuite>
@@ -66,7 +69,7 @@
             <directory>synchro</directory>
         </testsuite>
         <testsuite name="Setup">
-            <file>setup/SetupUtilsTest.php</file>
+            <directory>setup</directory>
         </testsuite>
         <testsuite name="Integration">
             <directory>integration</directory>

test/setup/DBBackupTest.php

@@ -2,9 +2,10 @@
 
 namespace Combodo\iTop\Test\UnitTest\Core;
 
+use CMDBSource;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
-use Config;
 use DBBackup;
+use utils;
 
 /**
  * @runTestsInSeparateProcesses
@@ -13,29 +14,76 @@ use DBBackup;
  */
 class DBBackupTest extends ItopTestCase
 {
+	/**
+	 * @throws \CoreException
+	 * @throws \MySQLException
+	 * @throws \ConfigException
+	 */
 	protected function setUp()
 	{
 		parent::setUp();
 		require_once(APPROOT.'core/config.class.inc.php');
 		require_once(APPROOT.'setup/backup.class.inc.php');
 		require_once(APPROOT.'core/cmdbsource.class.inc.php'); // DBBackup dependency
+
+		// We need a connection to the DB, so let's open it !
+		// We are using the default config file... as the server might not be configured for all the combination we are testing
+		// For example dev env and ci env won't accept TLS connection
+		$oConfigOnDisk = utils::GetConfig();
+		CMDBSource::InitFromConfig($oConfigOnDisk);
 	}
 
-	public function testGetMysqlCliTlsOptions()
+	/**
+	 * No TLS connection = no additional CLI args !
+	 *
+	 * @throws \CoreException
+	 * @throws \ConfigException
+	 * @throws \MySQLException
+	 */
+	public function testGetMysqlCliTlsOptionsNoTls()
 	{
-		$oConfig = new Config();
-		$oConfig->Set('db_tls.enabled', false);
+		$oConfigToTest = utils::GetConfig();
+
+		$oConfigToTest->Set('db_tls.enabled', false);
+		$sCliArgsNoTls = DBBackup::GetMysqlCliTlsOptions($oConfigToTest);
 
-		$sCliArgsNoTls = DBBackup::GetMysqlCliTlsOptions($oConfig);
 		$this->assertEmpty($sCliArgsNoTls);
+	}
 
-		$oConfig->Set('db_tls.enabled', true);
-		$sCliArgsMinCfg = DBBackup::GetMysqlCliTlsOptions($oConfig);
-		$this->assertEquals(' --ssl', $sCliArgsMinCfg);
+	/**
+	 * TLS connection configured = we need one CLI arg
+	 *
+	 * @return void
+	 * @throws \ConfigException
+	 * @throws \CoreException
+	 */
+	public function testGetMysqlCliTlsOptionsWithTlsNoCa()
+	{
+		$oConfigToTest = utils::GetConfig();
+		$oConfigToTest->Set('db_tls.enabled', true);
+		$sCliArgsMinCfg = DBBackup::GetMysqlCliTlsOptions($oConfigToTest);
 
+		// depending on the MySQL version, we would have `--ssl` or `--ssl-mode=VERIFY_CA`
+		$this->assertStringStartsWith(' --ssl', $sCliArgsMinCfg);
+	}
+
+	/**
+	 * TLS connection configured + CA option = we need multiple CLI args
+	 *
+	 * @return void
+	 * @throws \ConfigException
+	 * @throws \CoreException
+	 */
+	public function testGetMysqlCliTlsOptionsWithTlsAndCa()
+	{
+		$oConfigToTest = utils::GetConfig();
 		$sTestCa = 'my_test_ca';
-		$oConfig->Set('db_tls.ca', $sTestCa);
-		$sCliArgsCapathCfg = DBBackup::GetMysqlCliTlsOptions($oConfig);
-		$this->assertEquals(' --ssl --ssl-ca="'.$sTestCa.'"', $sCliArgsCapathCfg);
+
+		$oConfigToTest->Set('db_tls.enabled', true);
+		$oConfigToTest->Set('db_tls.ca', $sTestCa);
+		$sCliArgsCapathCfg = DBBackup::GetMysqlCliTlsOptions($oConfigToTest);
+
+		$this->assertStringStartsWith(' --ssl', $sCliArgsCapathCfg);
+		$this->assertStringEndsWith('--ssl-ca='.DBBackup::EscapeShellArg($sTestCa), $sCliArgsCapathCfg);
 	}
 }