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

# Conflicts: # core/cmdbsource.class.inc.php # core/config.class.inc.php # core/displayablegraph.class.inc.php # core/log.class.inc.php # datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php # datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php # datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php # dictionaries/tr.dictionary.itop.core.php # dictionaries/tr.dictionary.itop.ui.php # pages/UI.php # setup/itopdesignformat.class.inc.php # test/core/LogAPITest.php # test/integration/iTopModulesPhpVersionChecklistTest.php # test/postbuild_integration/SetupCssIntegrityChecklistTest.php # test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php # test/status/StatusTest.php
2026-04-21 09:38:48 +02:00 · 2022-01-10 16:15:00 +01:00
parent 9b0e55210d e530cbb4f2
commit 8578d18e7f
43 changed files with 1944 additions and 1840 deletions
--- a/test/application/DashboardLayoutTest.php
+++ b/test/application/DashboardLayoutTest.php
@@ -20,9 +20,6 @@
 use Combodo\iTop\Test\UnitTest\ItopTestCase;

 /**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
 * @covers utils
 */
 class DashboardLayoutTest extends ItopTestCase
--- a/test/application/UtilsTest.php
+++ b/test/application/UtilsTest.php
@@ -20,9 +20,6 @@
 */

 /**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
 * @covers utils
 */
 class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
@@ -247,6 +244,7 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
 	}

 	/**
+	 * @runInSeparateProcess
 	 * @dataProvider GetAbsoluteUrlAppRootPersistency
 	 */
 	public function testGetAbsoluteUrlAppRootPersistency($bBehindReverseProxy,$bForceTrustProxy1 ,$sExpectedAppRootUrl1,$bForceTrustProxy2 , $sExpectedAppRootUrl2,$bForceTrustProxy3 , $sExpectedAppRootUrl3)
--- a/test/core/CMDBSource/TransactionsTest.php
+++ b/test/core/CMDBSource/TransactionsTest.php
@@ -13,6 +13,9 @@ use Exception;
 use MetaModel;

 /**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
 *
 * @group itopRequestMgmt
 * Class TransactionsTest
@@ -94,7 +97,7 @@ class TransactionsTest extends ItopTestCase
 		}

 		// Verify if the ticket is considered as saved in the database
-		$this->assertEquals($bIsInDB, !$oTicket->IsNew());
+		$this->assertEquals($bIsInDB, !$oTicket->IsNew(), " The ticket should be persisted in the DB");

 		if (!$oTicket->IsNew()) {
 			$this->oMySQLiMock->SetShowRequest(false);
--- a/test/core/ExpressionTest.php
+++ b/test/core/ExpressionTest.php
@@ -5,6 +5,11 @@ namespace Combodo\iTop\Test\UnitTest\Core;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 use Expression;

+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
 class ExpressionTest extends ItopDataTestCase
 {
 	const USE_TRANSACTION = false;
--- a/test/core/Log/LogAPITest.php
+++ b/test/core/Log/LogAPITest.php
@@ -17,11 +17,6 @@ namespace Combodo\iTop\Test\UnitTest\Core\Log;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 use MetaModel;

-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
 class LogAPITest extends ItopDataTestCase
 {
 	private $mockFileLog;
--- a/test/core/Log/LogFileNameBuilderTest.php
+++ b/test/core/Log/LogFileNameBuilderTest.php
@@ -11,11 +11,6 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use DailyRotatingLogFileNameBuilder;
 use DateTime;

-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
 class LogFileNameBuilderTest extends ItopTestCase
 {
 	const TEST_LOGFILE_PREFIX = 'fileNameBuilder.test';
--- a/test/core/UniquenessConstraintTest.php
+++ b/test/core/UniquenessConstraintTest.php
@@ -14,11 +14,7 @@ use MetaModel;
 *
 * @package Combodo\iTop\Test\UnitTest\Core
 */
-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */class UniquenessConstraintTest extends ItopTestCase
+class UniquenessConstraintTest extends ItopTestCase
 {
 	protected function setUp()
 	{
--- a/test/core/WeeklyScheduledProcessTest.php
+++ b/test/core/WeeklyScheduledProcessTest.php
@@ -5,13 +5,6 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use DateTime;


-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- *
- * @package Combodo\iTop\Test\UnitTest\Core
- */
 class WeeklyScheduledProcessTest extends ItopTestCase
 {
 	protected function setUp()
--- a/test/core/sanitizer/AbstractDOMSanitizerTest.php
+++ b/test/core/sanitizer/AbstractDOMSanitizerTest.php
@@ -4,11 +4,6 @@ namespace Combodo\iTop\Test\UnitTest\Core\Sanitizer;

 use Combodo\iTop\Test\UnitTest\ItopTestCase;

-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
 abstract class AbstractDOMSanitizerTest extends ItopTestCase
 {
 	const INPUT_DIRECTORY = 'input';
--- a/test/core/sanitizer/SvgDOMSanitizerTest.php
+++ b/test/core/sanitizer/SvgDOMSanitizerTest.php
@@ -8,11 +8,6 @@ use SVGDOMSanitizer;
 require_once __DIR__.'/AbstractDOMSanitizerTest.php';


-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
 class SVGDOMSanitizerTest extends AbstractDOMSanitizerTest
 {
 	/**
--- a/test/coreExtensions/UserLocalTest.php
+++ b/test/coreExtensions/UserLocalTest.php
@@ -32,10 +32,6 @@ class UserLocalTest extends ItopDataTestCase

 	/**
 	 * @dataProvider ProviderValidatePassword
-	 *
-	 * @runTestsInSeparateProcesses
-	 * @preserveGlobalState disabled
-	 * @backupGlobals disabled
 	 */
 	public function testValidatePassword($sPassword, $aValidatorNames, $aConfigValueMap, $bExpectedCheckStatus, $expectedCheckIssues = null, $sUserLanguage = null)
 	{
--- a/test/integration/iTopModulesPhpVersionChecklistTest.php
+++ b/test/integration/iTopModulesPhpVersionChecklistTest.php
@@ -20,10 +20,6 @@ use iTopDesignFormat;


 /**
- *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
 * @group itop-community
 *
 * @covers iTopDesignFormat
--- a/test/integration/iTopModulesXmlVersionChecklistTest.php
+++ b/test/integration/iTopModulesXmlVersionChecklistTest.php
@@ -21,10 +21,6 @@ use iTopDesignFormat;


 /**
- *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
 * @group itop-community
 *
 * @covers iTopDesignFormat
--- a/test/phpunit.xml.dist
+++ b/test/phpunit.xml.dist
@@ -29,7 +29,7 @@
         forceCoversAnnotation="false"
         mapTestClassNameToCoveredClassName="false"
         printerClass="\PHPUnit\TextUI\ResultPrinter"
-         processIsolation="true"
+         processIsolation="false"
         stopOnError="false"
         stopOnFailure="false"
         stopOnIncomplete="false"
--- a/test/postbuild_integration/SetupCssIntegrityChecklistTest.php
+++ b/test/postbuild_integration/SetupCssIntegrityChecklistTest.php
@@ -28,27 +28,14 @@ use iTopDesignFormat;
 /**
 * Class iTopDesignFormatChecklistTest
 *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- *
 * @covers iTopDesignFormat
- *
- * @package Combodo\iTop\Test\UnitTest\Setup
 */
 class SetupCssIntegrityChecklistTest extends ItopTestCase
 {
-
-	protected function setUp()
-	{
-		parent::setUp();
-	}
-
 	public function testSetupCssIntegrity()
 	{
 		$sSetupCssPath = APPROOT.'css/setup.css';
 		$sSetupCssContent = file_get_contents($sSetupCssPath);
 		$this->assertGreaterThan(4000, strlen($sSetupCssContent), "Test if the resulting file $sSetupCssPath is long enough, the value is totally arbitrary (at the time of the writing the file is 5660o  long");
 	}
-
 }
--- a/test/postbuild_integration/iTopDesignFormatChecklistTest.php
+++ b/test/postbuild_integration/iTopDesignFormatChecklistTest.php
@@ -10,9 +10,6 @@ use PHPUnit\Exception;
 /**
 * Class iTopDesignFormatChecklistTest
 * Ticket 3053 - Check XML conversion methods
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
 *
 * @covers iTopDesignFormat
 *
--- a/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
+++ b/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
@@ -6,20 +6,12 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;


 /**
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- *
- * @since 3.0.0 N°3060 / N°3061
+ * @since 2.7.2 N°3060 / N°3061 Automatically check the installation.xml consistency
 *
 * @package Combodo\iTop\Test\UnitTest\Setup
 */
 class iTopModuleXmlInstallationChecklistTest extends ItopTestCase
 {
-	protected function setUp()
-	{
-		parent::setUp();
-	}
-
 	/**
 	 * make sure installation.xml is provided and respects XML format
 	 */
--- a/test/setup/SetupUtilsTest.php
+++ b/test/setup/SetupUtilsTest.php
@@ -10,10 +10,6 @@ use SetupUtils;
 /**
 * Class SetupUtilsTest
 *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- *
 * @covers SetupUtils
 *
 * @since 2.7.4 N°3412
--- a/test/setup/iTopDesignFormat/iTopDesignFormatTest.php
+++ b/test/setup/iTopDesignFormat/iTopDesignFormatTest.php
@@ -11,10 +11,6 @@ use iTopDesignFormat;
 /**
 * Class iTopDesignFormatTest
 *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- *
 * @covers iTopDesignFormat
 *
 * @since 2.7.0 N°2586
--- a/test/status/StatusTest.php
+++ b/test/status/StatusTest.php
@@ -9,11 +9,6 @@ namespace Combodo\iTop\Test\UnitTest\Status;

 use Combodo\iTop\Test\UnitTest\ItopTestCase;

-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
 class StatusTest extends ItopTestCase
 {
 	public function setUp()
@@ -22,23 +17,15 @@ class StatusTest extends ItopTestCase
 		require_once APPROOT.'core/config.class.inc.php'; // for constants
 	}

-	/**
-	 *
-	 */
-	public function testStatusWrongUrl()
-	{
+    public function testStatusWrongUrl() {
 		$sPath = APPROOT.'/status_wrong.php';

-		exec("php $sPath", $aOutput, $iRet);
-		$this->assertNotEquals(0, $iRet, "Problem executing status page: $sPath, $iRet, aOutput:\n".var_export($aOutput, true));
+        exec("php $sPath", $aOutput, $iRet);
+        $this->assertNotEquals(0, $iRet, "Problem executing status page: $sPath, $iRet, aOutput:\n" . var_export($aOutput, true));

-	}
+    }

-	/**
-	 *
-	 */
-	public function testStatusGood()
-	{
+    public function testStatusGood() {
 		$sPath = APPROOT.'/webservices/status.php';

 		exec("php $sPath", $aOutput, $iRet);