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

# Conflicts:
#	tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php

tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php

@@ -12,12 +12,9 @@ use PHPUnit\Framework\TestCase;
 use SetupUtils;
 
 /**
- * Class ItopTestCase
- *
  * Helper class to extend for tests that DO NOT need to access the DataModel or the Database
  *
- * @author Eric Espie <eric.espie@combodo.com>
- * @package Combodo\iTop\Test\UnitTest
+ * @since 3.0.4 3.1.1 3.2.0 N°6658 move some setUp/tearDown code to the corresponding methods *BeforeClass to speed up tests process time.
  */
 abstract class ItopTestCase extends TestCase
 {
@@ -25,7 +22,10 @@ abstract class ItopTestCase extends TestCase
 	public static $DEBUG_UNIT_TEST = false;
 
 	/**
-	 * Override the default value to disable the backup of globals in case of tests run in a separate process
+	 * @link https://docs.phpunit.de/en/9.6/annotations.html#preserveglobalstate PHPUnit `preserveGlobalState` annotation documentation
+	 *
+	 * @since 3.0.4 3.1.1 3.2.0 N°6658 Override default value creation so that we don't need to add the annotation on each test classes that have runInSeparateProcess.
+	 *                    This parameter isn't used when test is run in the same process so ok to change it globally !
 	 */
 	protected $preserveGlobalState = false;
 
@@ -76,7 +76,9 @@ abstract class ItopTestCase extends TestCase
 
 	/**
 	 * @throws \MySQLTransactionNotClosedException see N°5538
+	 *
 	 * @since 2.7.8 3.0.3 3.1.0 N°5538
+	 * @since 3.0.4 3.1.1 3.2.0 N°6658 if transaction not closed, we are now doing a rollback
 	 */
 	protected function tearDown(): void
 	{
@@ -92,7 +94,11 @@ abstract class ItopTestCase extends TestCase
 		}
 	}
 
-	/** Helper than can be called in the context of a data provider */
+	/**
+	 * Helper than can be called in the context of a data provider
+	 *
+	 * @since 3.0.4 3.1.1 3.2.0 N°6658 method creation
+	 */
 	public static function GetAppRoot()
 	{
 		if (defined('APPROOT')) {