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

# Conflicts:
#	test/sources/application/Helper/WebResourcesHelperTest.php
#	tests/php-unit-tests/ItopTestCase.php
#	tests/php-unit-tests/composer.lock
#	tests/php-unit-tests/unitary-tests/.make/release/DatamodelsXmlFilesTest.php
#	tests/php-unit-tests/unitary-tests/application/UI/Base/Layout/NavigationMenuTest.php
#	tests/php-unit-tests/unitary-tests/application/query/QueryTest.php
#	tests/php-unit-tests/unitary-tests/core/DBSearchTest.php
#	tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/BulkChangeExtKeyTest.inc.php
#	tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/CRUD/DBObjectTest.php
#	tests/php-unit-tests/unitary-tests/service/EventTest.php
#	tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.expected.xml
#	tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.input.xml
#	tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
#	tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
#	tests/php-unit-tests/unitary-tests/sources/Application/Helper/WebResourcesHelperTest.php
#	tests/php-unit-tests/unitary-tests/sources/Router/RouterTest.php
#	tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
#	tests/php-unit-tests/unitary-tests/webservices/ImportTest.inc.php
#	tests/php-unit-tests/unitary-tests/webservices/RestTest.php

tests/php-unit-tests/unitary-tests/application/DashboardLayoutTest.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright (C) 2013-2021 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Application;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+
+/**
+ * @covers utils
+ */
+class DashboardLayoutTest extends ItopTestCase
+{
+	/**
+	 * @return array
+	 */
+	public function GetDashletCoordinatesProvider()
+	{
+		return array(
+			'OneColLayout-Cell0' => array('DashboardLayoutOneCol', 0, array(0, 0)),
+			'OneColLayout-Cell1' => array('DashboardLayoutOneCol', 1, array(0, 1)),
+			'TwoColsLayout-Cell0' => array('DashboardLayoutTwoCols', 0, array(0, 0)),
+			'TwoColsLayout-Cell1' => array('DashboardLayoutTwoCols', 1, array(1, 0)),
+			'TwoColsLayout-Cell2' => array('DashboardLayoutTwoCols', 2, array(0, 1)),
+			'TwoColsLayout-Cell3' => array('DashboardLayoutTwoCols', 3, array(1, 1)),
+			'ThreeColsLayout-Cell0' => array('DashboardLayoutThreeCols', 0, array(0, 0)),
+			'ThreeColsLayout-Cell1' => array('DashboardLayoutThreeCols', 1, array(1, 0)),
+			'ThreeColsLayout-Cell2' => array('DashboardLayoutThreeCols', 2, array(2, 0)),
+			'ThreeColsLayout-Cell3' => array('DashboardLayoutThreeCols', 3, array(0, 1)),
+			'ThreeColsLayout-Cell4' => array('DashboardLayoutThreeCols', 4, array(1, 1)),
+			'ThreeColsLayout-Cell5' => array('DashboardLayoutThreeCols', 5, array(2, 1)),
+		);
+	}
+
+	/**
+	 * @param string $sDashboardLayoutClass
+	 * @param int $iCellIdx
+	 * @param array $aExpectedCoordinates
+	 * @dataProvider GetDashletCoordinatesProvider
+	 * @since N°2735
+	 */
+	public function testGetDashletCoordinates($sDashboardLayoutClass, $iCellIdx, $aExpectedCoordinates)
+	{
+		$oDashboardLayout = new $sDashboardLayoutClass();
+		$aDashletCoordinates = $oDashboardLayout->GetDashletCoordinates($iCellIdx);
+
+		$this->assertEquals($aExpectedCoordinates,$aDashletCoordinates);
+	}
+}

tests/php-unit-tests/unitary-tests/application/SCSSCompilationTest.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2022 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Application;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use utils;
+
+class SCSSCompilationTest extends ItopTestCase
+{
+
+	/**
+	 * @dataProvider CompileDefaultThemesProvider
+	 * @doesNotPerformAssertions
+	 * @return void
+	 */
+	public function testCompileDefaultThemes($sSassRelPath, $aImportRelPaths)
+	{
+		$aImportPaths = [];
+		foreach ($aImportRelPaths as $sPath) {
+			$aImportPaths[] = APPROOT.$sPath;
+		}
+
+		$sSassPath = APPROOT.$sSassRelPath;
+		$sCSS = utils::CompileCSSFromSASS(file_get_contents($sSassPath), $aImportPaths);
+
+		$this->debug($sCSS);
+	}
+
+	public function CompileDefaultThemesProvider()
+	{
+		return [
+			'console' => ['css/backoffice/main.scss', ['css/backoffice/']],
+			'portal' => ['env-production/itop-portal-base/portal/public/css/bootstrap-theme-combodo.scss', ['env-production//itop-portal-base/portal/public/css/']],
+		];
+	}
+
+}

tests/php-unit-tests/unitary-tests/application/Session/SessionTest.php

@@ -0,0 +1,146 @@
+<?php
+
+namespace Combodo\iTop\Test\UnitTest\Application;
+
+use Combodo\iTop\Application\Helper\Session;
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class SessionTest extends ItopTestCase
+{
+	protected function setUp(): void
+	{
+		parent::setUp();
+		Session::$bAllowCLI = true;
+	}
+
+	protected function tearDown(): void
+	{
+		parent::tearDown();
+		Session::$bAllowCLI = false;
+	}
+
+	/**
+	 * @covers \Combodo\iTop\Application\Helper\Session::Start
+	 */
+	public function testStart()
+	{
+		$this->assertNull(Session::$iSessionId);
+		Session::Start();
+		$this->assertNotNull(Session::$iSessionId);
+	}
+
+	/**
+	 * @covers \Combodo\iTop\Application\Helper\Session::WriteClose
+	 */
+	public function testWriteClose()
+	{
+		$this->assertNull(Session::$iSessionId);
+		Session::Start();
+		$this->assertNotNull(Session::$iSessionId);
+		Session::WriteClose();
+		$_SESSION['test'] = 'OK';
+		Session::Start();
+		$this->assertArrayNotHasKey('test', $_SESSION);
+	}
+
+	public function testReopenningSession()
+	{
+		Session::Start();
+		$_SESSION['test'] = 'OK';
+		Session::WriteClose();
+		unset($_SESSION['test']);
+		Session::Start();
+		$this->assertEquals('OK', $_SESSION['test']);
+	}
+
+	public function testSet()
+	{
+		Session::Start();
+		Session::Set('test', 'OK');
+		$this->assertEquals('OK', Session::Get('test'));
+		Session::WriteClose();
+		$this->assertEquals('OK', Session::Get('test'));
+		unset($_SESSION['test']);
+		Session::Start();
+		$this->assertEquals('OK', Session::Get('test'));
+	}
+
+	public function testSetArray()
+	{
+		Session::Start();
+		Session::Set(['test1', 'test2', 'test3'], 'OK');
+		$this->assertEquals('OK', Session::Get(['test1', 'test2', 'test3']));
+		Session::WriteClose();
+		$this->assertEquals('OK', Session::Get(['test1', 'test2', 'test3']));
+		unset($_SESSION['test1']);
+		Session::Start();
+		$this->assertEquals('OK', Session::Get(['test1', 'test2', 'test3']));
+	}
+
+	public function testSetOnClosedSession()
+	{
+		Session::Start();
+		Session::Set('test', 'OK');
+		$this->assertEquals('OK', Session::Get('test'));
+		Session::WriteClose();
+		$this->assertEquals('OK', Session::Get('test'));
+		Session::Set('test', 'OK');
+		$this->assertEquals('OK', Session::Get('test'));
+		unset($_SESSION['test']);
+		Session::Start();
+		$this->assertEquals('OK', Session::Get('test'));
+	}
+
+
+	public function testIsSet()
+	{
+		$this->assertFalse(Session::IsSet('test'));
+		Session::Start();
+		Session::Set('test', 'OK');
+		$this->assertTrue(Session::IsSet('test'));
+		Session::Set(['test1', 'test2', 'test3'], 'OK');
+		$this->assertTrue(Session::IsSet('test1'));
+		$this->assertTrue(Session::IsSet(['test1', 'test2', 'test3']));
+		Session::WriteClose();
+	}
+
+	public function testGet()
+	{
+		Session::Start();
+		$this->assertNull(Session::Get('test'));
+		Session::Set('test', 'OK');
+		$this->assertEquals('OK', Session::Get('test'));
+		Session::WriteClose();
+	}
+
+	public function testUnset()
+	{
+		Session::Start();
+		Session::Unset('test');
+		$this->assertFalse(Session::IsSet('test'));
+		Session::Set('test', 'OK');
+		$this->assertTrue(Session::IsSet('test'));
+		Session::Unset('test');
+		$this->assertFalse(Session::IsSet('test'));
+		Session::Set('test', 'OK');
+		$this->assertTrue(Session::IsSet('test'));
+		Session::Set(['test1', 'test2', 'test3'], 'OK');
+		$this->assertTrue(Session::IsSet(['test1', 'test2', 'test3']));
+		Session::Unset(['test1', 'test2', 'test3']);
+		$this->assertFalse(Session::IsSet(['test1', 'test2', 'test3']));
+	}
+
+	public function testRegenerateId()
+	{
+		Session::Start();
+		$iPrevSessionId = Session::$iSessionId;
+		Session::RegenerateId();
+		//$this->assertFalse(Session::IsSet('test'));
+		$this->assertNotEquals($iPrevSessionId, Session::$iSessionId);
+	}
+}

tests/php-unit-tests/unitary-tests/application/ThemeHandlerTest.php

@@ -0,0 +1,641 @@
+<?php
+
+namespace Combodo\iTop\Test\UnitTest\Application;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use FindStylesheetObject;
+use ThemeHandler;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ * @covers ThemeHandler
+ */
+class ThemeHandlerTest extends ItopTestCase
+{
+	const PATTERN = '|\\\/var[^"]+testimages|';
+	
+	private $oCompileCSSServiceMock;
+	private $sCompiledThemesDirAbsPath;
+	private $sCssAbsPath;
+	private $sDmCssAbsPath;
+	private $sJsonThemeParamFile;
+	private $sTmpDir;
+	private $aDirsToCleanup= [];
+
+	public function setUp(): void
+	{
+		parent::setUp();
+		$this->RequireOnceItopFile('application/themehandler.class.inc.php');
+		$this->RequireOnceItopFile('setup/modelfactory.class.inc.php');
+		$this->RequireOnceUnitTestFile('../setup/SubMFCompiler.php');
+
+		$this->oCompileCSSServiceMock = $this->createMock('CompileCSSService');
+		ThemeHandler::mockCompileCSSService($this->oCompileCSSServiceMock);
+
+		$this->sTmpDir = $this->CreateTmpdir().'/';
+		$this->aDirsToCleanup[] = $this->sTmpDir;
+
+
+		$this->sCompiledThemesDirAbsPath = $this->sTmpDir."branding/themes/";
+		$this->recurseMkdir($this->sCompiledThemesDirAbsPath."basque-red/");
+		$this->sCssAbsPath = $this->sCompiledThemesDirAbsPath.'basque-red/main.css';
+		$this->sDmCssAbsPath = $this->sCompiledThemesDirAbsPath.'datamodel-compiled-scss-rules.scss';
+		$this->sJsonThemeParamFile = $this->sCompiledThemesDirAbsPath.'basque-red/theme-parameters.json';
+		$this->RecurseCopy(APPROOT."/tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css", $this->sTmpDir."/branding/css");
+	}
+
+	public function tearDown(): void
+	{
+		parent::tearDown();
+
+		foreach ($this->aDirsToCleanup as $sDir)
+		{
+			echo $sDir;
+			$this->RecurseRmdir($sDir);
+		}
+	}
+
+	function KeepSignatureDiff($sSignature1, $sSignature2) : string {
+		$aSignature1 = json_decode($sSignature1, true);
+		$aSignature2 = json_decode($sSignature2, true);
+
+		$aDiffOuput = [];
+		foreach ($aSignature1 as $sKey => $oVal1){
+			if (is_array($oVal1) && ! empty($oVal1)){
+				$aCurrentDiffVal = [];
+				$oVal2 = $aSignature2[$sKey];
+				if (0 != sizeof($oVal1)){
+					foreach ($oVal1 as $sKey1 => $sVal1){
+						if (! array_key_exists($sKey1, $oVal2)){
+							$aCurrentDiffVal[$sKey1] = "Missing";
+						} else if ($sVal1 !== $oVal2[$sKey1]) {
+							$aCurrentDiffVal[$sKey1] = "expected:$sVal1 | actual:" . $oVal2[$sKey1];
+						}
+					}
+				}
+				if (! empty($oVal2)){
+					foreach ($oVal2 as $sKey2 => $sVal2){
+						if (! array_key_exists($sKey2, $oVal1)){
+							$aCurrentDiffVal[$sKey1] = "Missing";
+						}
+					}
+				}
+				if (! empty($aCurrentDiffVal)){
+					$aDiffOuput[$sKey] = $aCurrentDiffVal;
+				}
+			} else if ($oVal1 !== $aSignature2[$sKey]){
+					$aDiffOuput[$sKey] = "expected:$oVal1 | actual:$aSignature2[$sKey]";
+			}
+		}
+
+		return json_encode($aDiffOuput, true);
+	}
+
+	function recurseMkdir($dir)
+	{
+		if (is_dir($dir))
+		{
+			return true;
+		}
+
+		$sParentDir = dirname($dir);
+		if (!$this->recurseMkdir($sParentDir))
+		{
+			return false;
+		}
+
+		return @mkdir($dir);
+	}
+
+	public function testGetSignatureWithFileWithoutSignature()
+	{
+		$sTmpFile = tempnam(sys_get_temp_dir(), "sig");
+		file_put_contents($sTmpFile,"ffff");
+		$this->assertEquals("",  ThemeHandler::GetSignature($sTmpFile));
+	}
+
+	public function testGetSignature()
+	{
+		$sSig = ThemeHandler::GetSignature(APPROOT.'tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main.css');
+		$sExpectedSig=<<<JSON
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":{"css-variables":"3c3f5adf98b9dbf893658314436c4b93"},"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5"},"utility_imports":[]}
+JSON;
+
+		$this->assertEquals($sExpectedSig,  $sSig);
+	}
+
+	public function testGetVarSignature()
+	{
+		$sSignature=<<<JSON
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"934888ebb4991d4c76555be6b6d1d5cc","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":[],"utility_imports":[]}
+JSON;
+		$var_sig = ThemeHandler::GetVarSignature($sSignature);
+
+		$this->assertEquals("37c31105548fce44fecca5cb34e455c9",$var_sig);
+	}
+
+	/**
+	 * @param bool $readFromParamAttributeFromJson
+	 *
+	 * @throws \CoreException
+	 * @dataProvider CompileThemesProviderWithoutCss
+	 */
+	public function testCompileThemeWithoutCssFile_FocusOnParamAttribute($readFromParamAttributeFromJson=false)
+	{
+		$sExpectJsonFilePath = APPROOT.'tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/theme-parameters.json';
+		$sExpectedThemeParamJson = file_get_contents($sExpectJsonFilePath);
+		$aThemeParameters = json_decode($sExpectedThemeParamJson, true);
+		if (is_file($this->sJsonThemeParamFile))
+		{
+			unlink($this->sJsonThemeParamFile);
+		}
+		if (is_file($this->sCssAbsPath))
+		{
+			unlink($this->sCssAbsPath);
+		}
+
+		$this->oCompileCSSServiceMock->expects($this->exactly(1))
+			->method("CompileCSSFromSASS")
+			->willReturn("====CSSCOMPILEDCONTENT====");
+
+		if($readFromParamAttributeFromJson)
+		{
+			copy($sExpectJsonFilePath, $this->sJsonThemeParamFile);
+			$this->assertTrue(ThemeHandler::CompileTheme('basque-red', true, "COMPILATIONTIMESTAMP", null, [$this->sTmpDir.'/branding/themes/'], $this->sTmpDir));
+		}
+		else
+		{
+			$this->assertTrue(ThemeHandler::CompileTheme('basque-red', true, "COMPILATIONTIMESTAMP", $aThemeParameters, [$this->sTmpDir.'/branding/themes/'], $this->sTmpDir));
+		}
+		$this->assertTrue(is_file($this->sCssAbsPath));
+		$this->assertEquals($sExpectedThemeParamJson, file_get_contents($this->sJsonThemeParamFile));
+		$this->assertEquals(file_get_contents(APPROOT . 'tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main.css'), file_get_contents($this->sCssAbsPath));
+	}
+
+	public function CompileThemesProviderWithoutCss()
+	{
+		return [
+			"pass ParamAttributes and Save them in Json" => [false],
+			"use them from saved json" => [true]
+		];
+	}
+
+	/**
+	 * @param $ThemeParametersJson
+	 *
+	 * @param int $CompileCount
+	 *
+	 * @throws \CoreException
+	 * @dataProvider CompileThemesProviderEmptyArray
+	 */
+	public function testCompileThemesEmptyArray($ThemeParametersJson, $CompileCount=0)
+	{
+		$sCssPath = $this->sTmpDir . '/branding/themes/basque-red/main.css';
+		copy(APPROOT . 'tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main.css', $sCssPath);
+
+		$this->oCompileCSSServiceMock->expects($this->exactly($CompileCount))
+			->method("CompileCSSFromSASS")
+			->willReturn("====CSSCOMPILEDCONTENT====");
+
+		$this->assertEquals($CompileCount!=0,ThemeHandler::CompileTheme('basque-red', true, "COMPILATIONTIMESTAMP", json_decode($ThemeParametersJson, true), [$this->sTmpDir.'/branding/themes/'], $this->sTmpDir));
+	}
+
+	public function CompileThemesProviderEmptyArray()
+	{
+		$aEmptyImports = '{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"utility_imports":[],"variable_imports":[],"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}';
+		$aEmptyStyleSheets='{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"utility_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"variable_imports":[],"stylesheets":[]}';
+		$aEmptyVars='{"variables":[],"utility_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"variable_imports":[],"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}';
+		return [
+			"empty imports" => [$aEmptyImports],
+			"empty styles" => [$aEmptyStyleSheets],
+			"empty vars" => [$aEmptyVars, 1],
+		];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function CompileThemesProvider()
+	{
+		$sModifiedVariableThemeParameterJson='{"variables":{"brand-primary1":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"variable_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"},"utility_imports":[]}';
+		$sInitialThemeParamJson='{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"variable_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"},"utility_imports":[]}';
+		$sImportFilePath = '/branding/css/DO_NOT_CHANGE.css-variables.scss';
+		$sVarChangedMainCssPath="tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_varchanged.css";
+		$sStylesheetMainCssPath="tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_stylesheet.css";
+		$sImageMainCssPath="tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_imagemodified.css";
+		$sImportModifiedMainCssPath="tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_importmodified.css";
+		$sStylesheetFilePath = '/branding/css/DO_NOT_CHANGE.light-grey.scss';
+		$sImageFilePath = 'tests/php-unit-tests/unitary-tests/application/theme-handler/copied/testimages/images/green-header.gif';
+		return [
+			"setup context: variables list modified without any file touched" => [$sModifiedVariableThemeParameterJson, 1,false,false,false,$sImportFilePath, $sVarChangedMainCssPath],
+			"setup context: variables list modified with files touched" => [$sModifiedVariableThemeParameterJson, 1,false,true,false,$sImportFilePath, $sVarChangedMainCssPath, false],
+			"itop page/theme loading; variables list modified without any file touched" => [$sModifiedVariableThemeParameterJson, 0,false,false,false,$sImportFilePath, $sVarChangedMainCssPath, false],
+			//imports
+			"import file missing" => [$sInitialThemeParamJson, 0, true, false, false, $sImportFilePath],
+			"import file touched" => [$sInitialThemeParamJson, 0, false, true, false, $sImportFilePath],
+			"import file modified" => [$sInitialThemeParamJson, 1, false, false, true, $sImportFilePath, $sImportModifiedMainCssPath],
+			//stylesheets
+			"stylesheets file missing" => [$sInitialThemeParamJson, 0, true, false, false, $sStylesheetFilePath],
+			"stylesheets file touched" => [$sInitialThemeParamJson, 0, false, true, false, $sStylesheetFilePath],
+			"stylesheets file modified" => [$sInitialThemeParamJson, 1, false, false, true, $sStylesheetFilePath, $sStylesheetMainCssPath],
+			//images
+			"image file missing" => [$sInitialThemeParamJson, 0, true, false, false, $sImageFilePath],
+			"image file touched" => [$sInitialThemeParamJson, 0, false, true, false, $sImageFilePath],
+			"image file modified" => [$sInitialThemeParamJson, 1, false, false, true, $sImageFilePath, $sImageMainCssPath],
+		];
+	}
+
+
+	/**
+	 * @param $ThemeParametersJson
+	 * @param int $iCompileCSSFromSASSCount
+	 * @param boolean $bMissingFile
+	 * @param boolean $bFilesTouchedRecently
+	 * @param boolean $bFileMd5sumModified
+	 * @param null $sFileToTest
+	 * @param null $sExpectedMainCssPath
+	 * @param bool $bSetup
+	 *
+	 * @throws \CoreException
+	 * @dataProvider CompileThemesProvider
+	 */
+	public function testCompileThemes($ThemeParametersJson, $iCompileCSSFromSASSCount, $bMissingFile=false, $bFilesTouchedRecently=false, $bFileMd5sumModified=false, $sFileToTest=null, $sExpectedMainCssPath=null, $bSetup=true)
+	{
+		$sAfterReplacementCssVariableMd5sum='';
+		if (is_file($this->sTmpDir.'/'.$sFileToTest))
+		{
+			$sFileToTest = $this->sTmpDir.'/'.$sFileToTest;
+		} else {
+			$sFileToTest = APPROOT.'/'.$sFileToTest;
+		}
+
+		//copy images in test dir
+		$sAbsoluteImagePath = APPROOT.'tests/php-unit-tests/unitary-tests/application/theme-handler/copied/testimages/';
+		$this->recurseMkdir($sAbsoluteImagePath);
+		$this->aDirsToCleanup[] = dirname($sAbsoluteImagePath);
+		$this->RecurseCopy(APPROOT.'tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/', $sAbsoluteImagePath);
+
+		//change approot-relative in css-variable to use absolute path
+		$sCssVarPath = $this->sTmpDir."/branding/css/DO_NOT_CHANGE.css-variables.scss";
+		$sBeforeReplacementCssVariableMd5sum = md5_file($sCssVarPath);
+		echo 'BEFORE :'.$sBeforeReplacementCssVariableMd5sum.' '.$sCssVarPath.' ';
+		$sCssVariableContent = file_get_contents($sCssVarPath);
+		$sLine = '$approot-relative: "'.$sAbsoluteImagePath.'" !default;';
+		$sCssVariableContent = preg_replace("/\\\$approot-relative: \"(.*)\"/", $sLine, $sCssVariableContent);
+		file_put_contents($sCssVarPath, $sCssVariableContent);
+		if ($bMissingFile)
+		{
+			$sAfterReplacementCssVariableMd5sum = $sBeforeReplacementCssVariableMd5sum;
+			unlink($sFileToTest);
+		}
+
+		if (is_file($sCssVarPath))
+		{
+			$sAfterReplacementCssVariableMd5sum = md5_file($sCssVarPath);
+		}
+
+		//change cssvar md5sum + image absolute paths
+		$sMainCssContent = file_get_contents(APPROOT."tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_testcompilethemes.css");
+		$sMainCssContent = preg_replace('/MD5SUM/', $sAfterReplacementCssVariableMd5sum, $sMainCssContent);
+		$sReplacement = rtrim($sAbsoluteImagePath, '/');
+		$sReplacement=preg_replace('|\/|', '\/', $sReplacement);
+		$sMainCssContent = preg_replace(static::PATTERN,  $sReplacement, $sMainCssContent);
+		$cssPath = $this->sTmpDir . '/branding/themes/basque-red/main.css';
+		echo 'PUT md5sum: '.$sAfterReplacementCssVariableMd5sum.' in '.$cssPath.' ';
+		file_put_contents($cssPath, $sMainCssContent);
+
+		//should be after main.css modification to make sure precompilation check will be performed
+		if ($bFilesTouchedRecently)
+		{
+			sleep(1);
+			touch($sFileToTest);
+		}
+
+		//same: it should be after main.css modification
+		if ($bFileMd5sumModified)
+		{
+			$sMd5sum = md5_file($sFileToTest);
+			echo ' BEFORE touch: ' . $sMd5sum  .' ' . $sFileToTest;
+			sleep(1);
+			file_put_contents($sFileToTest, "###\n".file_get_contents($sFileToTest));
+
+			$sMd5sum = md5_file($sFileToTest);
+			echo ' AFTER touch: ' . $sMd5sum  .' ' . $sFileToTest;
+		}
+
+		if (is_file($sCssVarPath))
+		{
+			$sAfterReplacementCssVariableMd5sum = md5_file($sCssVarPath);
+		}
+
+		$this->oCompileCSSServiceMock->expects($this->exactly($iCompileCSSFromSASSCount))
+			->method("CompileCSSFromSASS")
+			->willReturn("====CSSCOMPILEDCONTENT====");
+
+		$aThemeParameters = json_decode($ThemeParametersJson, true);
+		$this->assertEquals($iCompileCSSFromSASSCount!=0, ThemeHandler::CompileTheme('basque-red', $bSetup, "COMPILATIONTIMESTAMP", $aThemeParameters, [$this->sTmpDir.'/branding/themes/'], $this->sTmpDir));
+
+		if ($iCompileCSSFromSASSCount==1)
+		{
+			$sExpectedMainCssFile = APPROOT.$sExpectedMainCssPath;
+			if (!is_file($sExpectedMainCssFile)) {
+				$this->assertTrue(false, "Cannot find expected main css file $sExpectedMainCssFile");
+			}
+
+			$aPatterns = [static::PATTERN, '/'.$sBeforeReplacementCssVariableMd5sum.'/'];
+			$aPatterns[] = "/8100523d2e76a70266f3e7110e2fe5fb/";
+			$aPatterns[] = '/MD5SUM/';
+			$aReplacements = [$sReplacement, $sAfterReplacementCssVariableMd5sum];
+			$aReplacements[] = md5(json_encode($aThemeParameters['variables']));
+			$aReplacements[] = $sAfterReplacementCssVariableMd5sum;
+			var_dump($aReplacements);
+			$this->DoInnerJsonValidation($sExpectedMainCssFile, $cssPath, $aPatterns, $aReplacements);
+		}
+	}
+
+	public function DoInnerJsonValidation($sExpectedCssFile, $sActualCssFile, $aPatterns, $aReplacements)
+	{
+		$sActualContent = file_get_contents($sActualCssFile);
+
+		//replace absolute path to fix it in any envt
+		$sExpectedContent = preg_replace($aPatterns,  $aReplacements, file_get_contents($sExpectedCssFile));
+
+		//echo($sExpectedContent);
+		if ($sExpectedContent != $sActualContent)
+		{
+			//try to have inner json diff failure
+			/** @var array $aExpectedJson */
+			//replace absolute path to fix it in any envt
+			$sExpectedJson = preg_replace($aPatterns,  $aReplacements, ThemeHandler::GetSignature($sExpectedCssFile));
+			$aExpectedJson = json_decode($sExpectedJson, true);
+			/** @var array $aActualJson */
+			$aActualJson = json_decode(ThemeHandler::GetSignature($sActualCssFile), true);
+			echo (ThemeHandler::GetSignature($sActualCssFile));
+			$this->assertEquals($aExpectedJson, $aActualJson, "CSS file dont match ($sExpectedCssFile / $sActualCssFile)");
+		}
+
+		$this->assertTrue(true);
+	}
+
+	/**
+	 * @param $sScssFile
+	 *
+	 * @dataProvider GetAllUrlFromScssProvider
+	 */
+	public function testGetAllUrlFromScss($sScssFile)
+	{
+		$aIncludedUrls = ThemeHandler::GetAllUrlFromScss(['attr' => "123"],APPROOT.$sScssFile);
+		$this->assertEquals(['approot-relative', 'version', 'version1'], array_values($aIncludedUrls['aMissingVariables']));
+		$this->assertEquals(["attr"=>"123"],
+			$aIncludedUrls['aFoundVariables']);
+		$aExpectedCompletedUrls = [
+			'css/ui-lightness/images/tutu.jpg',
+			"css/ui-lightness/images/tata.jpeg",
+			"css/ui-lightness/images/tete.jpeg?g=123"
+		];
+		$aExpectedToCompleteUrls = [
+			'\'abc/\'+ $approot-relative + "css/ui-lightness/images/toutou.png?v=" + $version',
+			"\$approot-relative + \"css/ui-lightness/images/toto.png?v=\" + \$version",
+			'$approot-relative + \'css/ui-lightness/images/titi.gif?v=\' + $version1',
+		'"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7?v=" + $version',
+		'$approot-relative + \'node_modules/raleway-webfont/fonts/Raleway-Thin.jpeg\'',
+		];
+
+		$aIncludedUrls['aCompleteUrls'];
+		$this->assertEquals($aExpectedCompletedUrls, array_values($aIncludedUrls['aCompleteUrls']));
+		$this->assertEquals($aExpectedToCompleteUrls, array_values($aIncludedUrls['aToCompleteUrls']));
+	}
+
+	/**
+	 * @return array
+	 */
+	public function GetAllUrlFromScssProvider()
+	{
+		return ['test-getimages.scss' => ['tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/test-getimages.scss']];
+	}
+
+	public function testFindMissingVariables()
+	{
+		$sContent = <<< 'SCSS'
+$approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
+$approot-relative2: "../../" !default; // relative to env-***/branding/themes/***/main.css
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$brand-primary: 	$combodo-orange !default;
+$brand-primary-lightest:	lighten($brand-primary, 15%) !default;
+$content-color: #eeeeee !default; 
+$default-font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !default;
+$icons-filter: hue-rotate(0deg) !default;
+$toto : titi;
+SCSS;
+		$aMissingVariables = ['gabu', 'toto', 'approot-relative', 'approot-relative2', 'gray-base', 'gray-darker', 'brand-primary', 'brand-primary-lightest', 'content-color', 'default-font-family', 'icons-filter'];
+		list($aMissingVariables, $aFoundVariables) = ThemeHandler::FindMissingVariables(['gabu' => 'zomeu'], $aMissingVariables, ["a" => "b"], $sContent);
+		$aExpectedFoundVariables = [
+			'gabu' => 'zomeu',
+			'toto' => 'titi',
+		    'approot-relative' => '../../../../../',
+		    'approot-relative2' => '../../',
+		    'gray-base' => '#000',
+		    'a' => 'b',
+		    'content-color' => '#eeeeee',
+		    'default-font-family' => 'Trebuchet MS,Tahoma,Verdana,Arial,sans-serif',
+		    'icons-filter' => 'hue-rotate(0deg)',
+			'toto' => 'titi',
+		];
+		$this->assertEquals($aExpectedFoundVariables, $aFoundVariables);
+		$this->assertEquals(['gray-darker', 'brand-primary', 'brand-primary-lightest'], $aMissingVariables);
+	}
+
+	public function testGetVariablesFromFile(){
+		$sContent = <<< 'SCSS'
+$approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
+$approot-relative2: "../../" !default; // relative to env-***/branding/themes/***/main.css
+$approot-relative3: '../../' ; // relative to env-***/branding/themes/***/main.css
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$brand-primary: 	$combodo-orange !default;
+$brand-primary-lightest:	lighten($brand-primary, 15%) !default;
+$content-color: #eeeeee !default; 
+$default-font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !default;
+$icons-filter: hue-rotate(0deg) !default;
+$toto : titi;
+SCSS;
+
+		file_put_contents($this->sTmpDir . DIRECTORY_SEPARATOR . 'css-variable.scss', $sContent);
+		$aVariables = ThemeHandler::GetVariablesFromFile(
+			[ 'css-variable.scss' ],
+			[ $this->sTmpDir ]
+		);
+
+		$aExpectedVariables = [
+			'approot-relative' => '../../../../../',
+			'approot-relative2' => '../../',
+			'approot-relative3' => '../../',
+			'gray-base' => '#000',
+			'gray-darker' => 'lighten($gray-base, 13.5%)',
+			'brand-primary' => '$combodo-orange',
+			'brand-primary-lightest' => 'lighten($brand-primary, 15%)',
+			'content-color' => '#eeeeee',
+			'default-font-family' => 'Trebuchet MS,Tahoma,Verdana,Arial,sans-serif',
+			'icons-filter' => 'hue-rotate(0deg)',
+			'toto' => 'titi',
+		];
+
+		$this->assertEquals(
+			$aExpectedVariables,
+			$aVariables);
+	}
+
+	/**
+	 * @param $sUrlTemplate
+	 * @param $aFoundVariables
+	 * @param $sExpectedUrl
+	 *
+	 * @dataProvider ResolveUrlProvider
+	 */
+	public function testResolveUrl($sUrlTemplate, $aFoundVariables, $sExpectedUrl)
+	{
+		$this->assertEquals($sExpectedUrl, ThemeHandler::ResolveUrl($sUrlTemplate, $aFoundVariables));
+	}
+
+	public function ResolveUrlProvider()
+	{
+		return [
+			'XXX + $key1 UNresolved' => ["abc/'+ \$key1", ['key'=>'123'], false],
+			'$key1 + XXX UNresolved' => ["\$key1 + abs", ['key'=>'123'], false],
+			'XXX + $key UNresolved' => ["abc/'+ \$unknownkey", ['key'=>'123'], false],
+			'XXX + $key resolved' => ["abc/'+ \$key", ['key'=>'123'], "abc/123"],
+			'XXX + $key1 resolved' => ["abc/'+ \$key1", ['key1'=>'123'], "abc/123"],
+			'$key + XXX resolved' => ["\$key + \"/abc", ['key'=>'123'], "123/abc"],
+			'XXX + $key + YYY resolved' => ["abc/'+ \$key + '/def", ['key'=>'123'], "abc/123/def"],
+		];
+	}
+
+	public function testGetIncludedImages()
+	{
+		$aStylesheetFile=glob($this->sTmpDir."/branding/css/*.scss");
+		$aStylesheetFile[]=$this->sTmpDir."/branding/css/ui-lightness/DO_NOT_CHANGE.jqueryui.scss";
+		$expectJsonFilePath = APPROOT.'tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/theme-parameters.json';
+		$expectedThemeParamJson = file_get_contents($expectJsonFilePath);
+		$aThemeParametersVariables = json_decode($expectedThemeParamJson, true);
+
+		//simulate adding timestamp
+		$aThemeParametersVariables['variables']['$version'] = microtime(true);
+
+		$aIncludedImages = ThemeHandler::GetIncludedImages($aThemeParametersVariables['variables'], $aStylesheetFile, "basque-red");
+
+		$aExpectedUris = json_decode(file_get_contents(APPROOT.'tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/expected-getimages.json'), true);
+		$aExpectedImages = [];
+		foreach ($aExpectedUris as $sExpectedUri)
+		{
+			$aExpectedImages[] = ThemeHandler::GetAppRootWithSlashes().$sExpectedUri;
+		}
+
+		$this->assertEquals($aExpectedImages, $aIncludedImages);
+	}
+
+	/**
+	 * @dataProvider FindStylesheetFileProvider
+	 * @throws \Exception
+	 */
+	public function testFindStylesheetFile(string $sFileToFind, array $aAllImports){
+		$sImportsPath = $this->sTmpDir.'branding/';
+
+		// Windows compat O:)
+		$sFileToFind = $this->UpdateDirSep($sFileToFind);
+		$sImportsPath = $this->UpdateDirSep($sImportsPath);
+
+		$aExpectedAllImports = [];
+		if (count($aAllImports) !== 0) {
+			foreach ($aAllImports as $sFileURI) {
+				$aExpectedAllImports[$sFileURI] = $this->UpdateDirSep($sImportsPath.$sFileURI);
+			}
+		}
+
+
+		$oFindStylesheetObject = new FindStylesheetObject();
+		ThemeHandler::FindStylesheetFile($sFileToFind, [$sImportsPath], $oFindStylesheetObject);
+
+		$this->assertEquals([$sFileToFind], $oFindStylesheetObject->GetStylesheetFileURIs());
+		$this->assertEquals($aExpectedAllImports, $oFindStylesheetObject->GetImportPaths());
+		$this->assertEquals($sImportsPath.$sFileToFind, $oFindStylesheetObject->GetLastStyleSheetPath());
+
+		$aExpectedAllStylesheetPaths = [];
+		foreach (array_merge([$sFileToFind], $aAllImports) as $sFileUri) {
+			$aExpectedAllStylesheetPaths [] = $this->UpdateDirSep($sImportsPath.$sFileUri);
+		}
+		$this->assertEquals($aExpectedAllStylesheetPaths, $oFindStylesheetObject->GetAllStylesheetPaths());
+	}
+
+	public function FindStylesheetFileProvider()
+	{
+		$sFileToFind3 = 'css/multi_imports.scss';
+		$sFileToFind4 = 'css/included_file1.scss';
+		$sFileToFind5 = 'css/included_scss/included_file2.scss';
+
+		return [
+			"single file to find" => [
+				"sFileToFind" => "css/DO_NOT_CHANGE.light-grey.scss",
+				"aAllImports" => [],
+			],
+			"scss with simple @imports" => [
+				"sFileToFind" => "css/simple_import.scss",
+				"aAllImports" => [$sFileToFind4],
+			],
+			"scss with multi @imports" => [
+				"sFileToFind" => $sFileToFind3,
+				"aAllImports" => [$sFileToFind4, $sFileToFind5]
+			],
+			"scss with simple @imports in another folder" => [
+				"sFileToFind" => "css/simple_import2.scss",
+				"aAllImports" => [$sFileToFind5]
+			],
+			"scss with @imports shortcut included_file3 => _included_file3.scss" => [
+				"sFileToFind" => "css/shortcut.scss",
+				"aAllImports" => ["css/_included_file3.scss", "css/included_scss/included_file4.scss"]
+			],
+			"scss with @imports shortcut same file and folder names => feature1/_feature1.scss" => [
+				"sFileToFind" => "css/shortcut2.scss",
+				"aAllImports" => ["css/feature1/_feature1.scss"],
+			],
+			"cross_reference & infinite loop" => [
+				"sFileToFind" => "css/cross_reference1.scss",
+				"aAllImports" => ["css/cross_reference2.scss"],
+			],
+		];
+	}
+
+	/**
+	 * @param string $sPath
+	 *
+	 * @return string replace '/' by appropriate dir separator, depending on OS
+	 *
+	 * @uses DIRECTORY_SEPARATOR
+	 */
+	private function UpdateDirSep(string $sPath)
+	{
+		return str_replace('/', DIRECTORY_SEPARATOR, $sPath);
+	}
+
+	/**
+	 * @param $sPath
+	 * @param $sExpectedCanonicalPath
+	 *
+	 * @dataProvider CanonicalizePathProvider
+	 */
+	public function testCanonicalizePath($sExpectedCanonicalPath, $sPath)
+	{
+		$this->assertEquals($sExpectedCanonicalPath, ThemeHandler::CanonicalizePath($sPath), "Failed to reduce path $sPath");
+	}
+
+	public function CanonicalizePathProvider()
+	{
+		return [
+			[ '/var/www/html/iTop/images/itop-logo-2.png', '/var/www/html/iTop/env-production/branding/themes/light-grey/../../../../images/itop-logo-2.png' ],
+			[ '/var/www/html/iTop/env-production/branding/themes/light-grey/images/', '/var/www/html/iTop/env-production/branding/themes/light-grey/images/' ],
+			[ '/var/www/html/iTop/css/ui-lightness/images/ui-icons_222222_256x240.png', '/var/www/html/iTop/env-production//branding/themes/light-grey//../../../../css/ui-lightness/images/ui-icons_222222_256x240.png' ]
+		];
+	}
+}

tests/php-unit-tests/unitary-tests/application/UI/Base/Layout/NavigationMenuTest.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace UI\Base\Layout;
+
+use ApplicationContext;
+use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu;
+use Combodo\iTop\Application\UI\Base\Layout\NavigationMenu\NavigationMenu;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+
+/**
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ * Class NavigationMenuTest
+ *
+ * @package UI\Base\Layout
+ */
+class NavigationMenuTest extends ItopDataTestCase {
+	public function IsAllowedProvider(){
+		return [
+			'show menu' => [ true ],
+			'hide menu' => [ false ],
+		];
+	}
+
+	/**
+	 * @dataProvider IsAllowedProvider
+	 * test used to make sure backward compatibility is ensured
+	 */
+	public function testIsAllowed($bExpectedIsAllowed=true){
+		\MetaModel::GetConfig()->Set('navigation_menu.show_organization_filter', $bExpectedIsAllowed);
+		$oNavigationMenu = new NavigationMenu(
+			$this->createMock(ApplicationContext::class),
+			$this->createMock(PopoverMenu::class));
+
+		$isAllowed = $oNavigationMenu->IsSiloSelectionEnabled();
+		$this->assertEquals($bExpectedIsAllowed, $isAllowed);
+	}
+
+	public function testIsAllowed_BackwardCompatibility_NoVariableInConfFile(){
+		\MetaModel::GetConfig()->Set('navigation_menu.show_organization_filter', false);
+
+		$sTmpFilePath = tempnam(sys_get_temp_dir(), 'test_');
+		$oInitConfig = \MetaModel::GetConfig();
+		$oInitConfig->WriteToFile($sTmpFilePath);
+
+		//remove variable for the test
+		$aLines = file($sTmpFilePath);
+
+		$aRows = array();
+
+		foreach ($aLines as $key => $sLine) {
+			if (!preg_match('/navigation_menu.show_organization_filter/', $sLine)) {
+				$aRows[] = $sLine;
+			}
+		}
+
+		file_put_contents($sTmpFilePath, implode("\n", $aRows));
+		$oTempConfig = new \Config($sTmpFilePath);
+
+		$isAllowed = $oTempConfig->Get('navigation_menu.show_organization_filter');
+
+		$this->assertEquals(true, $isAllowed);
+		unlink($sTmpFilePath);
+	}
+}

tests/php-unit-tests/unitary-tests/application/privUITransactionFileTest.php

@@ -0,0 +1,190 @@
+<?php
+/**
+ * Copyright (C) 2013-2021 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Application;
+
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use MetaModel;
+use privUITransactionFile;
+use UserRights;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ *
+ * @covers utils
+ * @group sampleDataNeeded
+ * @group defaultProfiles
+ */
+class privUITransactionFileTest extends ItopDataTestCase
+{
+	/** @var int ID of the "support agent" pofile in the sample data */
+	const SAMPLE_DATA_SUPPORT_PROFILE_ID = 5;
+	const USER1_TEST_LOGIN = 'user1_support_test_privUITransaction';
+	const USER2_TEST_LOGIN = 'user2_support_test_privUITransaction';
+
+	/**
+	 * @dataProvider cleanupOldTransactionsProvider
+	 */
+	public function testCleanupOldTransactions($iCleanableCreated, $iPreservableCreated, $sCleanablePrefix, $sPreservablePrefix)
+	{
+		MetaModel::GetConfig()->Set('transactions_gc_threshold', 100);
+
+		$iBaseLimit = time() - 24*3600; //24h
+
+		$sBaseDir = sys_get_temp_dir();
+		$sDir = "$sBaseDir/privUITransactionFileTest/cleanupOldTransactions";
+		if (is_dir($sDir)) {
+			$this->rm($sDir);
+		}
+		mkdir("$sDir", 0777, true);
+
+		for ($i = 0; $i < $iCleanableCreated; $i++) {
+			touch("$sDir/{$sCleanablePrefix}$i", $iBaseLimit - 10*60);
+		}
+		for ($i = 0; $i < $iPreservableCreated; $i++) {
+			touch("$sDir/{$sPreservablePrefix}$i", $iBaseLimit + 10*60);
+		}
+
+		$iCleanableCount = count(glob("$sDir/{$sCleanablePrefix}*"));
+		$iPreservableCount = count(glob("$sDir/{$sPreservablePrefix}*"));
+		$this->assertEquals($iCleanableCreated, $iCleanableCount);
+		$this->assertEquals($iPreservableCreated, $iPreservableCount);
+
+		$aArgs = [
+			'sTransactionDir' => "$sDir",
+		];
+		$oprivUITransactionFile = new privUITransactionFile();
+		$this->InvokeNonPublicMethod(get_class($oprivUITransactionFile), 'CleanupOldTransactions', $oprivUITransactionFile, $aArgs);
+
+		$iCleanableCount = count(glob("$sDir/{$sCleanablePrefix}*"));
+		$iPreservableCount = count(glob("$sDir/{$sPreservablePrefix}*"));
+		$this->assertEquals(0, $iCleanableCount);
+		$this->assertEquals($iPreservableCreated, $iPreservableCount);
+	}
+
+	public function cleanupOldTransactionsProvider()
+	{
+		$iBaseLimit = time() - 60 * 10; //ten minutes ago
+
+		$sBaseDir = sys_get_temp_dir();
+		$sDir = "$sBaseDir/privUITransactionFileTest/cleanupOldTransactions";
+
+		return  [
+			'linux - no content' => [
+				'iCleanableCreated' => 0,
+				'iPreservableCreated' => 0,
+				'sCleanablePrefix' => 'cleanable-',
+				'sPreservablePrefix' => 'preservable-',
+			],
+			'linux - cleanable content' => [
+				'iCleanableCreated' => 2,
+				'iPreservableCreated' => 0,
+				'sCleanablePrefix' => 'cleanable-',
+				'sPreservablePrefix' => 'preservable-',
+			],
+			'linux - preseved content' => [
+				'iCleanableCreated' => 0,
+				'iPreservableCreated' => 2,
+				'sCleanablePrefix' => 'cleanable-',
+				'sPreservablePrefix' => 'preservable-',
+			],
+			'win - no content' => [
+				'iCleanableCreated' => 0,
+				'iPreservableCreated' => 0,
+				'sCleanablePrefix' => 'cle',
+				'sPreservablePrefix' => 'pre',
+			],
+			'win - cleanable content' => [
+				'iCleanableCreated' => 2,
+				'iPreservableCreated' => 0,
+				'sCleanablePrefix' => 'cle',
+				'sPreservablePrefix' => 'pre',
+			],
+			'win - preseved content' => [
+				'iCleanableCreated' => 0,
+				'iPreservableCreated' => 2,
+				'sCleanablePrefix' => 'cle',
+				'sPreservablePrefix' => 'pre',
+			],
+		];
+	}
+
+	public function rm($sDir) {
+		$aFiles = array_diff(scandir($sDir), ['.','..']);
+		foreach ($aFiles as $sFile) {
+			if ((is_dir("$sDir/$sFile"))) {
+				$this->rm("$sDir/$sFile");
+			} else {
+				unlink("$sDir/$sFile");
+			}
+		}
+		return rmdir($sDir);
+	}
+
+	const USER_TEST_LOGIN = 'support_test_privUITransaction';
+
+	/**
+	 * @throws \SecurityException
+	 * @uses self::SAMPLE_DATA_SUPPORT_PROFILE_ID
+	 * @uses self::USER1_TEST_LOGIN
+	 * @uses self::USER2_TEST_LOGIN
+	 */
+	public function testIsTransactionValid()
+	{
+		$this->CreateUser(static::USER1_TEST_LOGIN, self::SAMPLE_DATA_SUPPORT_PROFILE_ID);
+		$this->CreateUser(static::USER2_TEST_LOGIN, self::SAMPLE_DATA_SUPPORT_PROFILE_ID);
+
+		// created users aren't admin, so each one can't see the other (\UserRights::GetSelectFilter)
+		// If calling \UserRights::Login(user1) then \UserRights::Login(user2) we won't be able to load user2 !
+		// As now we are in the admin context, we are calling FindUser() directly so that user objects will be saved in the UserRights cache !
+		// we can skip doing this for user1 as the first \UserRights::Login call will initialize the UserRights cache !
+		$this->InvokeNonPublicStaticMethod(UserRights::class, 'FindUser', [self::USER2_TEST_LOGIN]);
+
+		// create token in the user1 context
+		$bUser1Login1 = UserRights::Login(self::USER1_TEST_LOGIN);
+		$this->assertTrue($bUser1Login1, 'Login with user1 throw an error');
+		$sTransactionIdUserSupport = privUITransactionFile::GetNewTransactionId();
+		$bResult = privUITransactionFile::IsTransactionValid($sTransactionIdUserSupport, false);
+		$this->assertTrue($bResult, 'Token created by support user must be valid in the support user context');
+
+		// test token in the user2 context
+		$bUser2Login = UserRights::Login(self::USER2_TEST_LOGIN);
+		$this->assertTrue($bUser2Login, 'Login with user2 throw an error');
+		$bResult = privUITransactionFile::IsTransactionValid($sTransactionIdUserSupport, false);
+		$this->assertFalse($bResult, 'Token created by support user must be invalid in the admin user context');
+		$bResult = privUITransactionFile::RemoveTransaction($sTransactionIdUserSupport);
+		$this->assertFalse($bResult, 'Token created by support user cannot be removed in the admin user context');
+
+		// test other methods in the user1 context
+		$bUser1Login2 = UserRights::Login(self::USER1_TEST_LOGIN);
+		$this->assertTrue($bUser1Login2, 'Login with user1 throw an error');
+		$bResult = privUITransactionFile::RemoveTransaction($sTransactionIdUserSupport);
+		$this->assertTrue($bResult, 'Token created by support user must be removed in the support user context');
+
+		// test when no user logged (combodo-unauthenticated-form module for example)
+		UserRights::_ResetSessionCache();
+		$sTransactionIdUnauthenticatedUser = privUITransactionFile::GetNewTransactionId();
+		$bResult = privUITransactionFile::IsTransactionValid($sTransactionIdUnauthenticatedUser, false);
+		$this->assertTrue($bResult, 'Token created by unauthenticated user must be valid when no user logged');
+		$bResult = privUITransactionFile::RemoveTransaction($sTransactionIdUnauthenticatedUser);
+		$this->assertTrue($bResult, 'Token created by unauthenticated user must be removed when no user logged');
+	}
+}

tests/php-unit-tests/unitary-tests/application/query/QueryTest.php

@@ -0,0 +1,199 @@
+<?php
+/**
+ * Copyright (C) 2018 Dennis Lassiter
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Application\Search;
+
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use MetaModel;
+use Query;
+use QueryOQL;
+
+/**
+ * This test creates call export on requests and check request usage counter.
+ *
+ * Transaction are disabled to avoid data inconsistency between test and call to export (outside test scope)
+ * All objects created in this test will be deleted by the test.
+ *
+ * @group iTopQuery
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class QueryTest extends ItopDataTestCase
+{
+	// disable transaction to avoid data inconsistency between test and call to export (outside test scope)
+	const USE_TRANSACTION = false;
+
+	// user for exportation process
+	const USER = 'dani2';
+	const PASSWORD = '1TopCombodo+';
+	private $oUser;
+
+	/** @inheritDoc */
+	public function setUp(): void
+	{
+		parent::setUp();
+
+		// create export user
+		$this->CreateExportUser();
+	}
+
+	/**
+	 * Create new user for export authentication purpose.
+	 */
+	private function CreateExportUser()
+	{
+		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => 'Administrator'), true);
+		$this->oUser = $this->CreateUser(self::USER, $oAdminProfile->GetKey(), self::PASSWORD);
+	}
+
+	/**
+	 * Create an OQL query to list Person objects.
+	 *
+	 * @param string $sName query name
+	 * @param string $sDescription query description
+	 * @param string $sOql query oql phrase
+	 * @param string|null $sFields fields to export
+	 */
+	private function CreateQueryOQL(string $sName, string $sDescription, string $sOql, string $sFields = null) : QueryOQL
+	{
+		$oQuery = new QueryOQL();
+		$oQuery->Set('name', $sName);
+		$oQuery->Set('description', $sDescription);
+		$oQuery->Set('oql', $sOql);
+
+		if($sFields != null){
+			$oQuery->Set('fields', $sFields);
+		}
+
+		$oQuery->DBInsert();
+
+		return $oQuery;
+	}
+
+	/**
+	 * Test query export V1 usage.
+	 *
+	 * @param string $sDescription query description
+	 * @param string $sOql query oql phrase
+	 *
+	 * @dataProvider getQueryProvider
+	 */
+	public function testQueryExportV1Usage(string $sDescription, string $sOql)
+	{
+		// create query OQL
+		$oQuery = $this->CreateQueryOQL($this->dataName(), $sDescription, $sOql);
+
+		// call export service
+		$this->CallExportService($oQuery);
+
+		// reload to update counter (done by export process)
+		$oQuery->Reload();
+
+		// extract counter
+		$iResult = $oQuery->Get('export_count');
+
+		// delete the query
+		$oQuery->DBDelete();
+
+		// test
+		$this->assertEquals(1, $iResult);
+	}
+
+	/**
+	 * Test query export V2 usage.
+	 *
+	 * @param string $sDescription query description
+	 * @param string $sOql query oql phrase
+	 *
+	 * @dataProvider getQueryProvider
+	 */
+	public function testQueryExportV2Usage(string $sDescription, string $sOql)
+	{
+		// create query OQL
+		$oQuery = $this->CreateQueryOQL($this->dataName(), $sDescription, $sOql, 'first_name');
+
+		// call export service
+		$this->CallExportService($oQuery);
+
+		// reload to update counter (done by export process)
+		$oQuery->Reload();
+
+		// extract counter
+		$iResult = $oQuery->Get('export_count');
+
+		// delete the query
+		$oQuery->DBDelete();
+
+		// test
+		$this->assertEquals(1, $iResult);
+	}
+
+	/**
+	 * Data provide for test.
+	 *
+	 * @return array
+	 */
+	public function getQueryProvider()
+	{
+		return array(
+			'Export #1' => array('query without params', 'SELECT Person'),
+			'Export #2' => array('query with params', "SELECT Person WHERE first_name LIKE 'B%'")
+		);
+	}
+
+	/**
+	 * Call export for given query object.
+	 *
+	 * @param \Query $oQuery
+	 *
+	 * @return bool|string
+	 */
+	private function CallExportService(Query $oQuery)
+	{
+		// compute request url
+		$url = 	$oQuery->GetExportUrl();
+
+		// open curl
+		$curl = curl_init();
+
+		// curl options
+		curl_setopt($curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+		curl_setopt($curl, CURLOPT_USERPWD, self::USER . ':' . self::PASSWORD);
+		curl_setopt($curl, CURLOPT_URL, $url);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+
+		// execute curl
+		$result = curl_exec($curl);
+
+		// close curl
+		curl_close($curl);
+
+		return $result;
+	}
+
+	/** @inheritDoc */
+	protected function tearDown(): void
+	{
+		$this->oUser->DBDelete();
+	}
+
+}

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/DO_NOT_CHANGE.css-variables.scss

@@ -0,0 +1,123 @@
+/*!
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+$approot-relative: "../../../../" !default; // relative to env-***/branding/themes/***/main.css
+
+// Base colors
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$gray-dark:              #444 !default;
+$gray:                   #777 !default;
+$gray-light:             #808080 !default;
+$gray-lighter:           #ddd !default;
+$gray-extra-light:       #F1F1F1 !default;
+
+$white:					#FFFFFF !default;
+
+$combodo-orange:		#EA7D1E !default;
+$combodo-dark-gray:		#585653 !default;
+
+$combodo-orange-dark:		darken($combodo-orange, 13.8%) !default;
+$combodo-orange-darker:		darken($combodo-orange, 18%) !default;
+$combodo-dark-gray-dark:	darken($combodo-dark-gray, 13.5%) !default;
+$combodo-dark-gray-darker:	darken($combodo-dark-gray, 18%) !default;
+
+// Brand colors
+// - Bases
+$brand-primary: 	$combodo-orange !default;
+$brand-secondary: 	$combodo-dark-gray !default;
+// - Shades
+$brand-primary-lightest:	lighten($brand-primary, 15%) !default;
+$brand-primary-lighter:		lighten($brand-primary, 10%) !default;
+$brand-primary-light:		lighten($brand-primary, 6%) !default;
+$brand-primary-dark:		darken($brand-primary, 6%) !default;
+$brand-primary-darker:		darken($brand-primary, 10%) !default;
+$brand-primary-darkest:		darken($brand-primary, 15%) !default;
+$brand-secondary-lightest:	lighten($brand-secondary, 15%) !default;
+$brand-secondary-lighter:	lighten($brand-secondary, 10%) !default;
+$brand-secondary-light:		lighten($brand-secondary, 6%) !default;
+$brand-secondary-dark:		darken($brand-secondary, 6%) !default;
+$brand-secondary-darker:	darken($brand-secondary, 10%) !default;
+$brand-secondary-darkest:	darken($brand-secondary, 15%) !default;
+
+// Vars
+$highlight-color: $brand-primary !default;
+$grey-color: #555555 !default;
+$complement-color: #1c94c4 !default;
+$complement-light: #d6e8ef !default;
+$frame-background-color: $gray-extra-light !default;
+$text-color: #000 !default;
+$box-radius: 0px !default;
+$box-shadow-regular: 0 1px 1px rgba(0, 0, 0, 0.15) !default;
+$body-background-color : $white !default;
+
+$hyperlink-color: $complement-color !default;
+$hyperlink-text-decoration: none !default;
+
+////////////
+// Search //
+$search-form-container-color: $white !default;
+$search-form-container-bg-color: $complement-color !default;
+//
+$search-criteria-box-color: #2D2D2D !default;
+$search-criteria-box-picto-color: $brand-primary !default;
+$search-criteria-box-bg-color: #EEEEEE !default;
+$search-criteria-box-hover-color: $white !default;
+$search-criteria-box-border-color: #CCCCCC !default;
+$search-criteria-box-border: 1px solid $search-criteria-box-border-color !default;
+$search-criteria-box-radius: 1px !default;
+$search-criteria-more-less-details-color: #3F7294 !default;
+//
+$search-add-criteria-box-color: $search-criteria-box-color !default;
+$search-add-criteria-box-bg-color: $white !default;
+$search-add-criteria-box-hover-color: $gray-extra-light !default;
+//
+$search-button-box-color: $brand-primary !default;
+$search-button-box-bg-color: $white !default;
+$search-button-box-bg-hover-color: $gray-extra-light !default;
+
+/////////////
+// Buttons //
+/////////////
+// Toggle button
+$toggle-button-bg-color: #CCCCCC !default;
+$toggle-button-bg-checked-color: $brand-primary !default;
+$toggle-button-slider-bg-color: #FFFFFF !default;
+
+// Console elements
+$summary-details-background: $grey-color !default; 
+$main-header-background: $frame-background-color !default;
+$table-even-background: $frame-background-color !default;
+$table-hover-background: #fdf5d0 !default;
+$popup-menu-highlight-color: $highlight-color !default;
+$popup-menu-text-color: #000 !default;
+$popup-menu-background-color: #fff !default;
+$popup-menu-text-higlight-color: #fff !default;
+$breadcrumb-color: $grey-color !default;
+$breadcrumb-highlight-color: $highlight-color !default;
+
+// jQuery UI widgets vars
+$primary-text-color: #333333 !default;
+$secondary-text-color: $grey-color !default;
+$error-text-color: $white !default;
+$highlight-text-color: #363636 !default;
+$hover-background-color: #fde17c !default;
+$border-highlight-color: $brand-primary-dark !default;
+$highlight-item-color: $white !default;
+$content-color: #eeeeee !default; 
+$default-font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !default;
+$icons-filter: hue-rotate(0deg) !default;

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/README.md

@@ -0,0 +1,2 @@
+Files in this folder are not meant to be updated along with their original copies in /css.
+Check with Olivier for more information on their purpose / test case.

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/cross_reference1.scss

@@ -0,0 +1,2 @@
+
+@import 'cross_reference2.scss';

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/cross_reference2.scss

@@ -0,0 +1,2 @@
+
+@import 'cross_reference1.scss';

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/multi_imports.scss

@@ -0,0 +1,8 @@
+
+
+@import 'included_file1.scss';
+@import 'included_scss/included_file2.scss';
+
+/*!
+ * Combodo portal template v1.0.0
+*/

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/shortcut.scss

@@ -0,0 +1,3 @@
+
+@import 'included_file3';
+@import 'included_scss/included_file4';

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/shortcut2.scss

@@ -0,0 +1 @@
+@import 'feature1/feature1';

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/simple_import.scss

@@ -0,0 +1,2 @@
+
+@import 'included_file1.scss';

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/simple_import2.scss

@@ -0,0 +1,2 @@
+
+@import 'included_scss/included_file2.scss';

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main.css

@@ -0,0 +1,6 @@
+/*
+=== SIGNATURE BEGIN ===
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":{"css-variables":"3c3f5adf98b9dbf893658314436c4b93"},"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5"},"utility_imports":[]}
+=== SIGNATURE END ===
+*/
+====CSSCOMPILEDCONTENT====

tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/theme-parameters.json

@@ -0,0 +1 @@
+{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"utility_imports":[],"variable_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}

tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/expected-getimages.json

@@ -0,0 +1,36 @@
+[
+  "css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png",
+  "css/ui-lightness/images/ui-icons_ffffff_256x240.png",
+  "images/actions_right.png",
+  "images/ac-background.gif",
+  "images/green-square.gif",
+  "images/tv-item.gif",
+  "images/tv-collapsable.gif",
+  "images/tv-expandable.gif",
+  "images/tv-item-last.gif",
+  "images/tv-collapsable-last.gif",
+  "images/tv-expandable-last.gif",
+  "images/red-header.gif",
+  "images/green-header.gif",
+  "images/orange-header.gif",
+  "images/calendar.png",
+  "images/truncated.png",
+  "images/plus.gif",
+  "images/minus.gif",
+  "images/full-screen.png",
+  "images/indicator.gif",
+  "images/delete.png",
+  "images/info-mini.png",
+  "images/ok.png",
+  "images/error.png",
+  "images/eye-open-555.png",
+  "images/eye-closed-555.png",
+  "images/eye-open-fff.png",
+  "images/eye-closed-fff.png",
+  "css/ui-lightness/images/ui-icons_222222_256x240.png",
+  "css/ui-lightness/images/ui-icons_E87C1E_256x240.png",
+  "css/ui-lightness/images/ui-icons_1c94c4_256x240.png",
+  "css/ui-lightness/images/ui-icons_F26522_256x240.png",
+  "css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png",
+  "css/ui-lightness/images/ui-icons_ffd27a_256x240.png"
+]

tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/test-getimages.scss

@@ -0,0 +1,10 @@
+$approot-relative: "../../../../../"
+$version:"aaa"
+background-image: url('abc/'+ $approot-relative + "css/ui-lightness/images/toutou.png?v=" + $version);
+background-image: url($approot-relative + "css/ui-lightness/images/toto.png?v=" + $version);
+background: #666666 url($approot-relative + 'css/ui-lightness/images/titi.gif?v=' + $version1) 50% 50% repeat;
+list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7?v=" + $version);
+background-image: url('css/ui-lightness/images/tutu.jpg');
+background-image: url("css/ui-lightness/images/tata.jpeg");
+background-image: url("css/ui-lightness/images/tete.jpeg?g=" + $attr);
+url($approot-relative + 'node_modules/raleway-webfont/fonts/Raleway-Thin.jpeg') format('truetype'),

tests/php-unit-tests/unitary-tests/application/utilsTest.php

@@ -0,0 +1,808 @@
+<?php
+/**
+ * Copyright (C) 2018 Dennis Lassiter
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Application;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use utils;
+
+/**
+ * @covers utils
+ */
+class utilsTest extends ItopTestCase
+{
+	public function testEndsWith()
+	{
+		$this->assertFalse(utils::EndsWith('a', 'bbbb'));
+	}
+
+	/**
+	 * @dataProvider memoryLimitDataProvider
+	 */
+	public function testIsMemoryLimit($expected, $memoryLimit, $requiredMemory)
+	{
+		$this->assertSame($expected, utils::IsMemoryLimitOk($memoryLimit, $requiredMemory));
+	}
+
+	/**
+	 * DataProvider for testIsMemoryLimitOk
+	 *
+	 * @return array
+	 */
+	public function memoryLimitDataProvider()
+	{
+		return [
+			'current -1, required 1024' => [true, -1, 1024],
+			'current 1024, required 1024' => [true, 1024, 1024],
+			'current 2048, required 1024' => [true, 2048, 1024],
+			'current 1024, required 2048' => [false, 1024, 2048],
+		];
+	}
+
+	/**
+	 * @dataProvider realPathDataProvider
+	 * @covers       utils::RealPath()
+	 */
+	public function testRealPath($sPath, $sBasePath, $expected)
+	{
+		$this->assertSame($expected, utils::RealPath($sPath, $sBasePath), "utils::RealPath($sPath, $sBasePath) does not match $expected");
+	}
+
+	public function realPathDataProvider()
+	{
+		parent::setUp(); // if not called, APPROOT won't be defined :(
+
+		$sSep = DIRECTORY_SEPARATOR;
+		$sItopRootRealPath = realpath(APPROOT).$sSep;
+		$sLicenseFileName = 'license.txt';
+		if (!is_file(APPROOT.$sLicenseFileName))
+		{
+			$sLicenseFileName = 'LICENSE';
+		}
+
+		return [
+			$sLicenseFileName => [APPROOT.$sLicenseFileName, APPROOT, $sItopRootRealPath.$sLicenseFileName],
+			'unexisting file' => [APPROOT.'license_DOES_NOT_EXIST.txt', APPROOT, false],
+			'/'.$sLicenseFileName => [APPROOT.$sSep.$sLicenseFileName, APPROOT, $sItopRootRealPath.$sLicenseFileName],
+			'%2f'.$sLicenseFileName => [APPROOT.'%2f'. $sLicenseFileName, APPROOT, false],
+			'../'.$sLicenseFileName => [APPROOT.'..'.$sSep.$sLicenseFileName, APPROOT, false],
+			'%2e%2e%2f'.$sLicenseFileName => [APPROOT.'%2e%2e%2f'.$sLicenseFileName, APPROOT, false],
+			'application/utils.inc.php with basepath=APPROOT' => [
+				APPROOT.'application/utils.inc.php',
+				APPROOT,
+				$sItopRootRealPath.'application'.$sSep.'utils.inc.php',
+			],
+			'application/utils.inc.php with basepath=APPROOT/application' => [
+				APPROOT.'application/utils.inc.php',
+				APPROOT.'application',
+				$sItopRootRealPath.'application'.$sSep.'utils.inc.php',
+			],
+			'basepath containing / and \\' => [
+				APPROOT.'sources/Form/Form.php',
+				APPROOT.'sources/Form\\Form.php',
+				$sItopRootRealPath.'sources'.$sSep.'Form'.$sSep.'Form.php',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider LocalPathProvider
+	 *
+	 * @param $sAbsolutePath
+	 * @param $expected
+	 */
+	public function testLocalPath($sAbsolutePath, $expected)
+	{
+		$this->assertSame($expected, utils::LocalPath($sAbsolutePath));
+
+	}
+
+	public function LocalPathProvider()
+	{
+		return array(
+			'index.php' => array(
+				'sAbsolutePath' => APPROOT.'index.php',
+				'expected' => 'index.php',
+			),
+			'non existing' => array(
+				'sAbsolutePath' => APPROOT.'nonexisting/nonexisting',
+				'expected' => false,
+			),
+			'outside' => array(
+				'sAbsolutePath' => '/tmp',
+				'expected' => false,
+			),
+			'application/cmdbabstract.class.inc.php' => array(
+				'sAbsolutePath' => APPROOT.'application/cmdbabstract.class.inc.php',
+				'expected' => 'application/cmdbabstract.class.inc.php',
+			),
+			'dir' => array(
+				'sAbsolutePath' => APPROOT.'application/.',
+				'expected' => 'application',
+			),
+			'root' => array(
+				'sAbsolutePath' => APPROOT.'.',
+				'expected' => '',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider appRootUrlProvider
+	 * @covers utils::GetAppRootUrl
+	 */
+	public function testGetAppRootUrl($sReturnValue, $sCurrentScript, $sAppRoot, $sAbsoluteUrl)
+	{
+		$this->assertEquals($sReturnValue, utils::GetAppRootUrl($sCurrentScript, $sAppRoot, $sAbsoluteUrl));
+	}
+
+	public function appRootUrlProvider()
+	{
+		return array(
+			'Setup index (windows antislash)' => array('http://localhost/', 'C:\Dev\wamp64\www\itop-dev\setup\index.php', 'C:\Dev\wamp64\www\itop-dev', 'http://localhost/setup/'),
+			'Setup index (windows slash)' => array('http://127.0.0.1/', 'C:/web/setup/index.php', 'C:/web', 'http://127.0.0.1/setup/'),
+			'Setup index (windows slash, drive letter case difference)' => array('http://127.0.0.1/', 'c:/web/setup/index.php', 'C:/web', 'http://127.0.0.1/setup/'),
+		);
+	}
+
+	public function GetAbsoluteUrlAppRootPersistency() {
+		$this->setUp();
+
+		return [
+			'ForceTrustProxy 111' => [
+				'bBehindReverseProxy' => false,
+				'bForceTrustProxy1' => true,
+				'sExpectedAppRootUrl1' => 'https://proxy.com:4443/',
+				'bForceTrustProxy2' => true,
+				'sExpectedAppRootUrl2' => 'https://proxy.com:4443/',
+				'bForceTrustProxy3' => true,
+				'sExpectedAppRootUrl3' => 'https://proxy.com:4443/',
+			],
+			'ForceTrustProxy 101' => [
+				'bBehindReverseProxy' => false,
+				'bForceTrustProxy1' => true,
+				'sExpectedAppRootUrl1' => 'https://proxy.com:4443/',
+				'bForceTrustProxy2' => false,
+				'sExpectedAppRootUrl2' => 'https://proxy.com:4443/',
+				'bForceTrustProxy3' => true,
+				'sExpectedAppRootUrl3' => 'https://proxy.com:4443/',
+			],
+			'ForceTrustProxy 011' => [
+				'bBehindReverseProxy' => false,
+				'bForceTrustProxy1' => false,
+				'sExpectedAppRootUrl1' => 'http://example.com/',
+				'bForceTrustProxy2' => true,
+				'sExpectedAppRootUrl2' => 'https://proxy.com:4443/',
+				'bForceTrustProxy3' => true,
+				'sExpectedAppRootUrl3' => 'https://proxy.com:4443/',
+			],
+			'ForceTrustProxy 110' => [
+				'bBehindReverseProxy' => false,
+				'bForceTrustProxy1' => true,
+				'sExpectedAppRootUrl1' => 'https://proxy.com:4443/',
+				'bForceTrustProxy2' => true,
+				'sExpectedAppRootUrl2' => 'https://proxy.com:4443/',
+				'bForceTrustProxy3' => false,
+				'sExpectedAppRootUrl3' => 'https://proxy.com:4443/',
+			],
+			'ForceTrustProxy 010' => [
+				'bBehindReverseProxy' => false,
+				'bForceTrustProxy1' => false,
+				'sExpectedAppRootUrl1' => 'http://example.com/',
+				'bForceTrustProxy2' => true,
+				'sExpectedAppRootUrl2' => 'https://proxy.com:4443/',
+				'bForceTrustProxy3' => false,
+				'sExpectedAppRootUrl3' => 'https://proxy.com:4443/',
+			],
+			'ForceTrustProxy 001' => [
+				'bBehindReverseProxy' => false,
+				'bForceTrustProxy1' => false,
+				'sExpectedAppRootUrl1' => 'http://example.com/',
+				'bForceTrustProxy2' => false,
+				'sExpectedAppRootUrl2' => 'http://example.com/',
+				'bForceTrustProxy3' => true,
+				'sExpectedAppRootUrl3' => 'https://proxy.com:4443/',
+			],
+			'ForceTrustProxy 000' => [
+				'bBehindReverseProxy' => false,
+				'bForceTrustProxy1' => false,
+				'sExpectedAppRootUrl1' => 'http://example.com/',
+				'bForceTrustProxy2' => false,
+				'sExpectedAppRootUrl2' => 'http://example.com/',
+				'bForceTrustProxy3' => false,
+				'sExpectedAppRootUrl3' => 'http://example.com/',
+			],
+			'BehindReverseProxy ForceTrustProxy 010' => [
+				'bBehindReverseProxy' => true,
+				'bForceTrustProxy1' => false,
+				'sExpectedAppRootUrl1' => 'https://proxy.com:4443/',
+				'bForceTrustProxy2' => true,
+				'sExpectedAppRootUrl2' => 'https://proxy.com:4443/',
+				'bForceTrustProxy3' => false,
+				'sExpectedAppRootUrl3' => 'https://proxy.com:4443/',
+			],
+		];
+	}
+
+	/**
+	 * @runInSeparateProcess
+	 * @dataProvider GetAbsoluteUrlAppRootPersistency
+	 */
+	public function testGetAbsoluteUrlAppRootPersistency($bBehindReverseProxy,$bForceTrustProxy1 ,$sExpectedAppRootUrl1,$bForceTrustProxy2 , $sExpectedAppRootUrl2,$bForceTrustProxy3 , $sExpectedAppRootUrl3)
+	{
+		utils::GetConfig()->Set('behind_reverse_proxy', $bBehindReverseProxy);
+		utils::GetConfig()->Set('app_root_url', '');
+
+		//should match http://example.com/ when not trusting the proxy
+		//should match https://proxy.com:4443/ when  trusting the proxy
+		$_SERVER = [
+			'REMOTE_ADDR' => '127.0.0.1', //is not set, disable IsProxyTrusted
+			'SERVER_NAME' => 'example.com',
+			'SERVER_PORT' => '80',
+			'REQUEST_URI' => '/index.php?baz=1',
+			'SCRIPT_NAME' => '/index.php',
+			'SCRIPT_FILENAME' => APPROOT.'index.php',
+			'QUERY_STRING' => 'baz=1',
+			'HTTP_X_FORWARDED_HOST' => 'proxy.com',
+			'HTTP_X_FORWARDED_PORT' => '4443',
+			'HTTP_X_FORWARDED_PROTO' => 'https',
+			'HTTPS' => null,
+		];
+
+		$this->assertEquals($sExpectedAppRootUrl1, utils::GetAbsoluteUrlAppRoot($bForceTrustProxy1));
+
+		$this->assertEquals($sExpectedAppRootUrl2, utils::GetAbsoluteUrlAppRoot($bForceTrustProxy2));
+
+		$this->assertEquals($sExpectedAppRootUrl3, utils::GetAbsoluteUrlAppRoot($bForceTrustProxy3));
+	}
+
+
+	/**
+	 * @dataProvider GetDefaultUrlAppRootProvider
+	 */
+	public function testGetDefaultUrlAppRoot($bForceTrustProxy, $bConfTrustProxy, $aServerVars, $sExpectedAppRootUrl)
+	{
+		$_SERVER = $aServerVars;
+		utils::GetConfig()->Set('behind_reverse_proxy', $bConfTrustProxy);
+		$sAppRootUrl = utils::GetDefaultUrlAppRoot($bForceTrustProxy);
+		$this->assertEquals($sExpectedAppRootUrl, $sAppRootUrl);
+	}
+
+	public function GetDefaultUrlAppRootProvider()
+	{
+		$this->setUp();
+
+		$baseServerVar = [
+			'REMOTE_ADDR' => '127.0.0.1', //is not set, disable IsProxyTrusted
+			'SERVER_NAME' => 'example.com',
+			'HTTP_X_FORWARDED_HOST' => null,
+			'SERVER_PORT' => '80',
+			'HTTP_X_FORWARDED_PORT' => null,
+			'REQUEST_URI' => '/index.php?baz=1',
+			'SCRIPT_NAME' => '/index.php',
+			'SCRIPT_FILENAME' => APPROOT.'index.php',
+			'QUERY_STRING' => 'baz=1',
+			'HTTP_X_FORWARDED_PROTO' => null,
+			'HTTP_X_FORWARDED_PROTOCOL' => null,
+			'HTTPS' => null,
+		];
+
+		return [
+			'no proxy, http' => [
+				'bForceTrustProxy' => false,
+				'bConfTrustProxy' => false,
+				'aServerVars' => array_merge($baseServerVar, []),
+				'sExpectedAppRootUrl' => 'http://example.com/',
+			],
+			'no proxy, subPath, http' => [
+				'bForceTrustProxy' => false,
+				'bConfTrustProxy' => false,
+				'aServerVars' => array_merge($baseServerVar, [
+					'REQUEST_URI' => '/foo/index.php?baz=1',
+				]),
+				'sExpectedAppRootUrl' => 'http://example.com/foo/',
+			],
+			'IIS lack REQUEST_URI' => [
+				'bForceTrustProxy' => false,
+				'bConfTrustProxy' => false,
+				'aServerVars' => array_merge($baseServerVar, [
+					'REQUEST_URI' => null,
+					'SCRIPT_NAME' => '/foo/index.php',
+				]),
+				'sExpectedAppRootUrl' => 'http://example.com/foo/',
+			],
+			'no proxy, https' => [
+				'bForceTrustProxy' => false,
+				'bConfTrustProxy' => false,
+				'aServerVars' => array_merge($baseServerVar, [
+					'SERVER_PORT' => '443',
+					'HTTPS' => 'on',
+				]),
+				'sExpectedAppRootUrl' => 'https://example.com/',
+			],
+			'no proxy, https on 4443' => [
+				'bForceTrustProxy' => false,
+				'bConfTrustProxy' => false,
+				'aServerVars' => array_merge($baseServerVar, [
+					'SERVER_PORT' => '4443',
+					'HTTPS' => 'on',
+				]),
+				'sExpectedAppRootUrl' => 'https://example.com:4443/',
+			],
+			'with proxy, not enabled' => [
+				'bForceTrustProxy' => false,
+				'bConfTrustProxy' => false,
+				'aServerVars' => array_merge($baseServerVar, [
+					'HTTP_X_FORWARDED_HOST' => 'proxy.com',
+					'HTTP_X_FORWARDED_PORT' => '4443',
+					'HTTP_X_FORWARDED_PROTO' => 'https',
+				]),
+				'sExpectedAppRootUrl' => 'http://example.com/',
+			],
+			'with proxy, enabled HTTP_X_FORWARDED_PROTO' => [
+				'bForceTrustProxy' => false,
+				'bConfTrustProxy' => true,
+				'aServerVars' => array_merge($baseServerVar, [
+					'HTTP_X_FORWARDED_HOST' => 'proxy.com',
+					'HTTP_X_FORWARDED_PORT' => '4443',
+					'HTTP_X_FORWARDED_PROTO' => 'https',
+				]),
+				'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
+			],
+			'with proxy, enabled - alt HTTP_X_FORWARDED_PROTO COL' => [
+				'bForceTrustProxy' => false,
+				'bConfTrustProxy' => true,
+				'aServerVars' => array_merge($baseServerVar, [
+					'HTTP_X_FORWARDED_HOST' => 'proxy.com',
+					'HTTP_X_FORWARDED_PORT' => '4443',
+					'HTTP_X_FORWARDED_PROTOCOL' => 'https',
+				]),
+				'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
+			],
+			'with proxy, disabled, forced' => [
+				'bForceTrustProxy' => true,
+				'bConfTrustProxy' => false,
+				'aServerVars' => array_merge($baseServerVar, [
+					'HTTP_X_FORWARDED_HOST' => 'proxy.com',
+					'HTTP_X_FORWARDED_PORT' => '4443',
+					'HTTP_X_FORWARDED_PROTO' => 'https',
+				]),
+				'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
+			],
+			'with proxy, enabled, forced' => [
+				'bForceTrustProxy' => true,
+				'bConfTrustProxy' => true,
+				'aServerVars' => array_merge($baseServerVar, [
+					'HTTP_X_FORWARDED_HOST' => 'proxy.com',
+					'HTTP_X_FORWARDED_PORT' => '4443',
+					'HTTP_X_FORWARDED_PROTO' => 'https',
+				]),
+				'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
+			],
+
+			'with proxy, disabled, forced, no remote addr' => [
+				'bForceTrustProxy' => true,
+				'bConfTrustProxy' => false,
+				'aServerVars' => array_merge($baseServerVar, [
+					'REMOTE_ADDR' => null,
+					'HTTP_X_FORWARDED_HOST' => 'proxy.com',
+					'HTTP_X_FORWARDED_PORT' => '4443',
+					'HTTP_X_FORWARDED_PROTO' => 'https',
+				]),
+				'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
+			],
+			'with proxy, enabled, no remote addr' => [
+				'bForceTrustProxy' => false,
+				'bConfTrustProxy' => true,
+				'aServerVars' => array_merge($baseServerVar, [
+					'REMOTE_ADDR' => null,
+					'HTTP_X_FORWARDED_HOST' => 'proxy.com',
+					'HTTP_X_FORWARDED_PORT' => '4443',
+					'HTTP_X_FORWARDED_PROTO' => 'https',
+				]),
+				'sExpectedAppRootUrl' => 'http://example.com/',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider ToCamelCaseProvider
+	 * @covers       utils::ToCamelCase
+	 *
+	 * @param string $sInput
+	 * @param string $sExpectedOutput
+	 *
+	 * @return void
+	 */
+	public function testToCamelCase(string $sInput, string $sExpectedOutput)
+	{
+		$sTestedOutput = utils::ToCamelCase($sInput);
+		$this->assertEquals($sExpectedOutput, $sTestedOutput, "Camel case transformation for '$sInput' doesn't match. Got '$sTestedOutput', expected '$sExpectedOutput'.");
+	}
+
+	/**
+	 * @since 3.1.0
+	 * @return \string[][]
+	 */
+	public function ToCamelCaseProvider(): array
+	{
+		return [
+			'One word' => [
+				'hello',
+				'Hello',
+			],
+			'Two words separated with space' => [
+				'hello world',
+				'HelloWorld',
+			],
+			'Two words separated with underscore' => [
+				'hello_world',
+				'HelloWorld',
+			],
+			'Two words separated with dash' => [
+				'hello-world',
+				'HelloWorld',
+			],
+			'Two words separated with dot' => [
+				'hello.world',
+				'Hello.world',
+			],
+			'Three words separated with underscore and space' => [
+				'hello_there world',
+				'HelloThereWorld',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider ToSnakeCaseProvider
+	 * @covers       utils::ToSnakeCase
+	 *
+	 * @param string $sInput
+	 * @param string $sExpectedOutput
+	 *
+	 * @return void
+	 */
+	public function testToSnakeCase(string $sInput, string $sExpectedOutput)
+	{
+		$sTestedOutput = utils::ToSnakeCase($sInput);
+		$this->assertEquals($sExpectedOutput, $sTestedOutput, "Snake case transformation for '$sInput' doesn't match. Got '$sTestedOutput', expected '$sExpectedOutput'.");
+	}
+
+	/**
+	 * @since 3.1.0
+	 * @return \string[][]
+	 */
+	public function ToSnakeCaseProvider(): array
+	{
+		return [
+			'One word lowercase' => [
+				'hello',
+				'hello',
+			],
+			'One word uppercase' => [
+				'HELLO',
+				'hello',
+			],
+			'One word capitalize' => [
+				'Hello',
+				'hello',
+			],
+			'Two words separated with space' => [
+				'hello world',
+				'hello_world',
+			],
+			'Two words separated with underscore' => [
+				'hello_world',
+				'hello_world',
+			],
+			'Two words separated with dash' => [
+				'hello-world',
+				'hello_world',
+			],
+			'Two words separated with dot' => [
+				'hello.world',
+				'hello_world',
+			],
+			'Two words camel cased' => [
+				'HelloWorld',
+				'hello_world',
+			],
+			'Two words camel cased with acronym' => [
+				'HTMLWorld',
+				'html_world',
+			],
+			'Three words separated with underscore and space' => [
+				'hello_there world',
+				'hello_there_world',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider ToAcronymProvider
+	 * @covers       utils::ToAcronym
+	 *
+	 * @param string $sInput
+	 * @param string $sExceptedAcronym
+	 */
+	public function testToAcronym(string $sInput, string $sExceptedAcronym)
+	{
+		$sTestedAcronym = utils::ToAcronym($sInput);
+		$this->assertEquals($sExceptedAcronym, $sTestedAcronym, "Acronym for '$sInput' doesn't match. Got '$sTestedAcronym', expected '$sExceptedAcronym'.");
+	}
+
+	/**
+	 * @since 3.0.0
+	 */
+	public function ToAcronymProvider()
+	{
+		return [
+			'One word, upper case letter' => [
+				'Carrie',
+				'C',
+			],
+			'One word, lower case letter' => [
+				'carrie',
+				'C',
+			],
+			'Application name' => [
+				'iTop',
+				'I',
+			],
+			'Several words, upper case letters' => [
+				'Carrie Ann Moss',
+				'CAM',
+			],
+			'Several words, mixed case letters' => [
+				'My name My name',
+				'MM',
+			],
+			'Several words, upper case letters, two first hyphened' => [
+				'Lily-Rose Depp',
+				'LRD',
+			],
+			'Several words, mixed case letters, two first hyphened' => [
+				'Lily-rose Depp',
+				'LD',
+			],
+			'Several words, upper case letetrs, two last hypened' => [
+				'Jada Pinkett-Smith',
+				'JPS',
+			],
+			'Several words, mixed case letters, two last hyphened' => [
+				'Jada Pinkett-smith',
+				'JP',
+			],
+			'Several words, cyrillic alphabet' => [
+				'Денис Александра',
+				'ДА',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider GetMentionedObjectsFromTextProvider
+	 * @covers       utils::GetMentionedObjectsFromText
+	 *
+	 * @param string $sInput
+	 * @param string $sFormat
+	 * @param array $aExceptedMentionedObjects
+	 *
+	 * @throws \Exception
+	 */
+	public function testGetMentionedObjectsFromText(string $sInput, string $sFormat, array $aExceptedMentionedObjects)
+	{
+		$aTestedMentionedObjects = utils::GetMentionedObjectsFromText($sInput, $sFormat);
+
+		$sExpectedAsString = print_r($aExceptedMentionedObjects, true);
+		$sTestedAsString = print_r($aTestedMentionedObjects, true);
+
+		$this->assertEquals($sTestedAsString, $sExpectedAsString, "Found mentioned objects don't match. Got: $sTestedAsString, expected $sExpectedAsString");
+	}
+
+	/**
+	 * @since 3.0.0
+	 */
+	public function GetMentionedObjectsFromTextProvider(): array
+	{
+		$sAbsUrlAppRoot = utils::GetAbsoluteUrlAppRoot();
+
+		return [
+			'No object' => [
+				"Begining
+				Second line
+				End",
+				utils::ENUM_TEXT_FORMAT_HTML,
+				[],
+			],
+			'1 UserRequest' => [
+				"Begining
+				Before link <a href=\"$sAbsUrlAppRoot/pages/UI.php&operation=details&class=UserRequest&id=12345&foo=bar\">R-012345</a> After link
+				End",
+				utils::ENUM_TEXT_FORMAT_HTML,
+				[
+					'UserRequest' => ['12345'],
+				],
+			],
+			'2 UserRequests' => [
+				"Begining
+				Before link <a href=\"$sAbsUrlAppRoot/pages/UI.php&operation=details&class=UserRequest&id=12345&foo=bar\">R-012345</a> After link
+				And <a href=\"$sAbsUrlAppRoot/pages/UI.php&operation=details&class=UserRequest&id=987654&foo=bar\">R-987654</a>
+				End",
+				utils::ENUM_TEXT_FORMAT_HTML,
+				[
+					'UserRequest' => ['12345', '987654'],
+				],
+			],
+			'1 UserRequest, 1 Person' => [
+				"Begining
+				Before link <a href=\"$sAbsUrlAppRoot/pages/UI.php&operation=details&class=UserRequest&id=12345&foo=bar\">R-012345</a> After link
+				And <a href=\"$sAbsUrlAppRoot/pages/UI.php&operation=details&class=Person&id=3&foo=bar\">Claude Monet</a>
+				End",
+				utils::ENUM_TEXT_FORMAT_HTML,
+				[
+					'UserRequest' => ['12345'],
+					'Person' => ['3'],
+				],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider FormatInitialsForMedallionProvider
+	 * @covers utils::FormatInitialsForMedallion
+	 *
+	 * @param string $sInput
+	 * @param string $sExpected
+	 */
+	public function testFormatInitialsForMedallion(string $sInput, string $sExpected)
+	{
+		$sTested = utils::FormatInitialsForMedallion($sInput);
+		$this->assertEquals($sExpected, $sTested);
+	}
+
+	/**
+	 * @since 3.0.1
+	 */
+	public function FormatInitialsForMedallionProvider()
+	{
+		return [
+			'All letters kept (2)' => [
+				'AB',
+				'AB',
+			],
+			'All letters kept (3)' => [
+				'ABC',
+				'ABC',
+			],
+			'Only 3 first letters kept (4)' => [
+				'ABCD',
+				'ABC',
+			],
+		];
+	}
+
+	/**
+	 * @param string $sExpressionToConvert
+	 * @param int $iExpectedConvertedValue
+	 *
+	 * @dataProvider ConvertToBytesProvider
+	 */
+	public function testConvertToBytes($sExpressionToConvert, $iExpectedConvertedValue)
+	{
+		$iCurrentConvertedValue = utils::ConvertToBytes($sExpressionToConvert);
+		self::assertEquals($iExpectedConvertedValue, $iCurrentConvertedValue, 'Converted value wasn\'t the one expected !');
+		self::assertSame($iExpectedConvertedValue, $iCurrentConvertedValue, 'Value was converted but not of the expected type');
+	}
+
+	public function ConvertToBytesProvider()
+	{
+		return [
+			'123 int value' => ['123', 123],
+			'-1 no limit'   => ['-1', -1],
+			'56k'           => ['56k', 56 * 1024],
+			'512M'          => ['512M', 512 * 1024 * 1024],
+			'2G'            => ['2G', 2 * 1024 * 1024 * 1024],
+		];
+	}
+
+	/**
+	 * @param string|null $sString
+	 * @param int $iExpected
+	 *
+	 * @dataProvider StrLenProvider
+	 */
+	public function testStrLen(?string $sString, int $iExpected)
+	{
+		$iComputed = utils::StrLen($sString);
+		self::assertEquals($iExpected, $iComputed, 'Length was not as expected');
+	}
+
+	public function StrLenProvider(): array
+	{
+		return [
+			'null value' => [null, 0],
+			'0 character' => ['', 0],
+			'1 character' => ['a', 1],
+			'5 characters' => ['abcde', 5],
+		];
+	}
+
+	/**
+	 * Test sanitizer.
+	 *
+	 * @param $type string type of sanitizer
+	 * @param $valueToSanitize ? value to sanitize
+	 * @param $expectedResult ? expected result
+	 *
+	 * @return void
+	 *
+	 * @dataProvider sanitizerDataProvider
+	 */
+	public function testSanitizer($type, $valueToSanitize, $expectedResult)
+	{
+		$this->assertEquals($expectedResult, utils::Sanitize($valueToSanitize, null, $type), 'url sanitize failed');
+	}
+
+	/**
+	 * DataProvider for testSanitizer
+	 *
+	 * @return array
+	 */
+	public function sanitizerDataProvider()
+	{
+		return [
+			'good integer'            => [utils::ENUM_SANITIZATION_FILTER_INTEGER, '2565', '2565'],
+			'bad integer'             => [utils::ENUM_SANITIZATION_FILTER_INTEGER, 'a2656', '2656'],
+			/**
+			 * 'class' filter needs a loaded datamodel... and is only an indirection to \MetaModel::IsValidClass so might very important to test !
+			 * If we switch this class to ItopDataTestCase then we are seeing :
+			 *   - the class now takes 18s to process instead of... 459ms when using ItopTestCase !!!
+			 *   - multiple errors are thrown in testGetAbsoluteUrlAppRootPersistency :(
+			 * We decided it wasn't worse the effort to test the 'class' filter !
+			 */
+			//			'good class' => ['class', 'UserRequest', 'UserRequest'],
+			//			'bad class' => ['class', 'MyUserRequest',null],
+			'good string'             => [utils::ENUM_SANITIZATION_FILTER_STRING, 'Is Peter smart and funny?', 'Is Peter smart and funny?'],
+			'bad string'              => [utils::ENUM_SANITIZATION_FILTER_STRING, 'Is Peter <smart> & funny?', 'Is Peter &#60;smart&#62; &#38; funny?'],
+			'good transaction_id'     => [utils::ENUM_SANITIZATION_FILTER_TRANSACTION_ID, '8965.-dd', '8965.-dd'],
+			'bad transaction_id'      => [utils::ENUM_SANITIZATION_FILTER_TRANSACTION_ID, '8965.-dd+', null],
+			'good route'              => [utils::ENUM_SANITIZATION_FILTER_ROUTE, 'object.modify', 'object.modify'],
+			'good route with underscore' => [utils::ENUM_SANITIZATION_FILTER_ROUTE, 'object.apply_modify', 'object.apply_modify'],
+			'bad route with space'    => [utils::ENUM_SANITIZATION_FILTER_ROUTE, 'object modify', null],
+			'good operation'          => [utils::ENUM_SANITIZATION_FILTER_OPERATION, 'modify', 'modify'],
+			'good operation with underscore' => [utils::ENUM_SANITIZATION_FILTER_OPERATION, 'apply_modify', 'apply_modify'],
+			'bad operation with space' => [utils::ENUM_SANITIZATION_FILTER_OPERATION, 'apply modify', null],
+			'good parameter'          => [utils::ENUM_SANITIZATION_FILTER_PARAMETER, 'JU8965-dd=_', 'JU8965-dd=_'],
+			'bad parameter'           => [utils::ENUM_SANITIZATION_FILTER_PARAMETER, '8965.-dd+', null],
+			'good field_name'         => [utils::ENUM_SANITIZATION_FILTER_FIELD_NAME, 'Name->bUzz38', 'Name->bUzz38'],
+			'bad field_name'          => [utils::ENUM_SANITIZATION_FILTER_FIELD_NAME, 'name-buzz', null],
+			'good context_param'      => [utils::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM, '%dssD25_=%:+-', '%dssD25_=%:+-'],
+			'bad context_param'       => [utils::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM, '%dssD,25_=%:+-', null],
+			'good element_identifier' => [utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER, 'AD05nb', 'AD05nb'],
+			'bad element_identifier' => [utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER, 'AD05nb+', 'AD05nb'],
+			'good url' => [utils::ENUM_SANITIZATION_FILTER_URL, 'https://www.w3schools.com', 'https://www.w3schools.com'],
+			'bad url' => [utils::ENUM_SANITIZATION_FILTER_URL, 'https://www.w3schoo<6F><6F>ls.co<63>m', 'https://www.w3schools.com'],
+			'raw_data' => ['raw_data', '<Test>\s😃😃😃', '<Test>\s😃😃😃'],
+		];
+	}
+}