N°6644 - Tests: Restore proper CI branch, unit tests run and fix a typo

core/kpi.class.inc.php

@@ -1,20 +1,18 @@
 <?php
 
 /**
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Application\EventRegister\ApplicationEvents;
 use Combodo\iTop\Core\Kpi\KpiLogData;
-use Combodo\iTop\Service\Events\EventService;
-use Combodo\iTop\Service\Events\iEventServiceSetup;
 use Combodo\iTop\Service\Module\ModuleService;
 
 /**
  * Measures operations duration, memory usage, etc. (and some other KPIs)
  */
-class ExecutionKPI implements iEventServiceSetup
+
+class ExecutionKPI
 {
 	protected static $m_bEnabled_Duration = false;
 	protected static $m_bEnabled_Memory = false;
@@ -25,18 +23,15 @@ class ExecutionKPI implements iEventServiceSetup
 
 	protected static $m_aStats = []; // Recurrent operations
 	protected static $m_aExecData = []; // One shot operations
-	/** @var true */
-	private static bool $bMetamodelStarted = false;
+	/**
+	 * @var array[ExecutionKPI]
+	 */
+	protected static $m_aExecutionStack = []; // embedded execution stats
 
-	private static ?float $fLastReportTime = null;
-	private static ?float $iLastReportMemory = null;
-
-	// For stats
 	protected $m_fStarted = null;
+	protected $m_fChildrenDuration = 0; // Count embedded
 	protected $m_iInitialMemory = null;
 
-	private static array $aBootstrapOperations = [];
-
 	public static function EnableDuration($iLevel)
 	{
 		if ($iLevel > 0) {
@@ -76,7 +71,6 @@ class ExecutionKPI implements iEventServiceSetup
 				return true;
 			}
 		}
-
 		return false;
 	}
 
@@ -103,7 +97,7 @@ class ExecutionKPI implements iEventServiceSetup
 		$sFor = self::$m_sAllowedUser == '*' ? 'EVERYBODY' : "'".trim(self::$m_sAllowedUser)."'";
 		$sSlowQueries = '';
 		if (self::$m_fSlowQueries > 0) {
-			$sSlowQueries = '. Slow Queries: '.self::$m_fSlowQueries.'s';
+			$sSlowQueries = ". Slow Queries: ".self::$m_fSlowQueries."s";
 		}
 
 		$aExtensions = [];
@@ -133,7 +127,7 @@ class ExecutionKPI implements iEventServiceSetup
 			$sRequest .= ' operation: '.$_POST['operation'];
 		}
 
-		$fStop = microtime(true);
+		$fStop = MyHelpers::getmicrotime();
 		if (($fStop - $fItopStarted) > self::$m_fSlowQueries) {
 			// Invoke extensions to log the KPI operation
 			/** @var \iKPILoggerExtension $oExtensionInstance */
@@ -157,17 +151,17 @@ class ExecutionKPI implements iEventServiceSetup
 
 		$sTableStyle = 'background-color: #ccc; margin: 10px;';
 
-		$sHtml = '<hr/>';
+		$sHtml = "<hr/>";
 		$sHtml .= "<div style=\"background-color: grey; padding: 10px;\">";
 		$sHtml .= "<h3><a name=\"".md5($sExecId)."\">KPIs</a> - $sRequest</h3>";
 		$oStarted = DateTime::createFromFormat('U.u', $fItopStarted);
 		$sHtml .= '<p>'.$oStarted->format('Y-m-d H:i:s.u').'</p>';
-		$sHtml .= '<p>log_kpi_user_id: '.UserRights::GetUserId().'</p>';
-		$sHtml .= '<div>';
+		$sHtml .= "<p>log_kpi_user_id: ".UserRights::GetUserId()."</p>";
+		$sHtml .= "<div>";
 		$sHtml .= "<table border=\"1\" style=\"$sTableStyle\">";
-		$sHtml .= '<thead>';
-		$sHtml .= '   <th>Operation</th><th>Begin</th><th>End</th><th>Duration</th><th>Memory start</th><th>Memory end</th><th>Memory peak</th>';
-		$sHtml .= '</thead>';
+		$sHtml .= "<thead>";
+		$sHtml .= "   <th>Operation</th><th>Begin</th><th>End</th><th>Duration</th><th>Memory start</th><th>Memory end</th><th>Memory peak</th>";
+		$sHtml .= "</thead>";
 		foreach (self::$m_aExecData as $aOpStats) {
 			$sOperation = $aOpStats['op'];
 			$sBegin = round($aOpStats['time_begin'], 3);
@@ -186,12 +180,12 @@ class ExecutionKPI implements iEventServiceSetup
 				}
 			}
 
-			$sHtml .= '<tr>';
+			$sHtml .= "<tr>";
 			$sHtml .= "   <td>$sOperation</td><td>$sBegin</td><td>$sEnd</td><td>$sDuration</td><td>$sMemBegin</td><td>$sMemEnd</td><td>$sMemPeak</td>";
-			$sHtml .= '</tr>';
+			$sHtml .= "</tr>";
 		}
-		$sHtml .= '</table>';
-		$sHtml .= '</div>';
+		$sHtml .= "</table>";
+		$sHtml .= "</div>";
 
 		$aConsolidatedStats = [];
 		foreach (self::$m_aStats as $sOperation => $aOpStats) {
@@ -214,20 +208,20 @@ class ExecutionKPI implements iEventServiceSetup
 				}
 			}
 			$aConsolidatedStats[$sOperation] = [
-				'count'    => $iTotalOp,
+				'count' => $iTotalOp,
 				'duration' => $fTotalOp,
-				'min'      => $fMinOp,
-				'max'      => $fMaxOp,
-				'avg'      => $fTotalOp / $iTotalOp,
+				'min' => $fMinOp,
+				'max' => $fMaxOp,
+				'avg' => $fTotalOp / $iTotalOp,
 				'max_args' => $sMaxOpArguments,
 			];
 		}
 
-		$sHtml .= '<div>';
+		$sHtml .= "<div>";
 		$sHtml .= "<table border=\"1\" style=\"$sTableStyle\">";
-		$sHtml .= '<thead>';
-		$sHtml .= '   <th>Operation</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th><th>Avg</th>';
-		$sHtml .= '</thead>';
+		$sHtml .= "<thead>";
+		$sHtml .= "   <th>Operation</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th><th>Avg</th>";
+		$sHtml .= "</thead>";
 		foreach ($aConsolidatedStats as $sOperation => $aOpStats) {
 			$sOperation = '<a href="#'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
 			$sCount = $aOpStats['count'];
@@ -236,14 +230,14 @@ class ExecutionKPI implements iEventServiceSetup
 			$sMax = '<a href="#'.md5($sExecId.$aOpStats['max_args']).'">'.round($aOpStats['max'], 3).'</a>';
 			$sAvg = round($aOpStats['avg'], 3);
 
-			$sHtml .= '<tr>';
+			$sHtml .= "<tr>";
 			$sHtml .= "   <td>$sOperation</td><td>$sCount</td><td>$sDuration</td><td>$sMin</td><td>$sMax</td><td>$sAvg</td>";
-			$sHtml .= '</tr>';
+			$sHtml .= "</tr>";
 		}
-		$sHtml .= '</table>';
-		$sHtml .= '</div>';
+		$sHtml .= "</table>";
+		$sHtml .= "</div>";
 
-		$sHtml .= '</div>';
+		$sHtml .= "</div>";
 
 		$sHtml .= "<p><a href=\"#end-".md5($sExecId)."\">Next page stats</a></p>";
 
@@ -293,18 +287,18 @@ class ExecutionKPI implements iEventServiceSetup
 						$sOperationHtml = '<a name="'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
 						$sHtml .= "<h4>$sOperationHtml</h4>";
 						$sHtml .= "<table border=\"1\" style=\"$sTableStyle\">";
-						$sHtml .= '<thead>';
-						$sHtml .= '   <th>Operation details (+ blame caller if log_kpi_duration = 2)</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th>';
-						$sHtml .= '</thead>';
+						$sHtml .= "<thead>";
+						$sHtml .= "   <th>Operation details (+ blame caller if log_kpi_duration = 2)</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th>";
+						$sHtml .= "</thead>";
 						$bDisplayHeader = false;
 					}
-					$sHtml .= '<tr>';
+					$sHtml .= "<tr>";
 					$sHtml .= "   <td>$sHtmlArguments</td><td>$iCountInter</td><td>$sTotalInter</td><td>$sMinInter</td><td>$sMaxInter</td>";
-					$sHtml .= '</tr>';
+					$sHtml .= "</tr>";
 				}
 			}
 			if (!$bDisplayHeader) {
-				$sHtml .= '</table>';
+				$sHtml .= "</table>";
 				$sHtml .= "<p><a href=\"#".md5($sExecId)."\">Back to page stats</a></p>";
 			}
 			self::Report($sHtml);
@@ -339,50 +333,39 @@ class ExecutionKPI implements iEventServiceSetup
 
 		$aNewEntry = null;
 
-		if (is_null(static::$fLastReportTime)) {
-			static::$fLastReportTime = $fItopStarted;
-		}
-
-		if (is_null(static::$iLastReportMemory)) {
-			global $iItopInitialMemory;
-			static::$iLastReportMemory = $iItopInitialMemory;
-		}
-
-		$fStarted = static::$fLastReportTime;
-		$fStopped = microtime(true);
+		$fStarted = $this->m_fStarted;
+		$fStopped = $this->m_fStarted;
 		if (self::$m_bEnabled_Duration) {
+			$fStopped = MyHelpers::getmicrotime();
 			$aNewEntry = [
 				'op'         => $sOperationDesc,
-				'time_begin' => $fStarted - $fItopStarted,
+				'time_begin' => $this->m_fStarted - $fItopStarted,
 				'time_end'   => $fStopped - $fItopStarted,
 			];
+			// Reset for the next operation (if the object is recycled)
+			$this->m_fStarted = $fStopped;
 		}
-		static::$fLastReportTime = $fStopped;
 
-		$iInitialMemory = static::$iLastReportMemory;
-		$iCurrentMemory = $iInitialMemory;
-		$iPeakMemory = $iInitialMemory;
+		$iInitialMemory = is_null($this->m_iInitialMemory) ? 0 : $this->m_iInitialMemory;
+		$iCurrentMemory = 0;
+		$iPeakMemory = 0;
 		if (self::$m_bEnabled_Memory) {
 			$iCurrentMemory = self::memory_get_usage();
 			if (is_null($aNewEntry)) {
 				$aNewEntry = ['op' => $sOperationDesc];
 			}
-			$aNewEntry['mem_begin'] = $iInitialMemory;
+			$aNewEntry['mem_begin'] = $this->m_iInitialMemory;
 			$aNewEntry['mem_end'] = $iCurrentMemory;
 			$iPeakMemory = self::memory_get_peak_usage();
 			$aNewEntry['mem_peak'] = $iPeakMemory;
 			// Reset for the next operation (if the object is recycled)
-			static::$iLastReportMemory = $iCurrentMemory;
+			$this->m_iInitialMemory = $iCurrentMemory;
 		}
 
 		if (self::$m_bEnabled_Duration || self::$m_bEnabled_Memory) {
-			$aCallstack = ['callstack' => $this->GetCallStack()];
-			if (static::$bMetamodelStarted) {
-				foreach (static::$aBootstrapOperations as $oLog) {
-					$this->LogOperation($oLog);
-				}
-				static::$aBootstrapOperations = [];
-				// Invoke extensions to log the KPI operation
+			// Invoke extensions to log the KPI operation
+			/** @var \iKPILoggerExtension $oExtensionInstance */
+			foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
 				$sExtension = ModuleService::GetInstance()->GetModuleNameFromCallStack(1);
 				$oKPILogData = new KpiLogData(
 					KpiLogData::TYPE_REPORT,
@@ -393,24 +376,9 @@ class ExecutionKPI implements iEventServiceSetup
 					$sExtension,
 					$iInitialMemory,
 					$iCurrentMemory,
-					$iPeakMemory,
-					$aCallstack
+					$iPeakMemory
 				);
-				$this->LogOperation($oKPILogData);
-			} else {
-				$oKPILogData = new KpiLogData(
-					KpiLogData::TYPE_REPORT,
-					'Step',
-					$sOperationDesc,
-					$fStarted,
-					$fStopped,
-					'',
-					$iInitialMemory,
-					$iCurrentMemory,
-					$iPeakMemory,
-					$aCallstack
-				);
-				static::$aBootstrapOperations[] = $oKPILogData;
+				$oExtensionInstance->LogOperation($oKPILogData);
 			}
 		}
 
@@ -420,21 +388,13 @@ class ExecutionKPI implements iEventServiceSetup
 		$this->ResetCounters();
 	}
 
-	private function LogOperation(KpiLogData $oKPILogData): void
-	{
-		/** @var \iKPILoggerExtension $oExtensionInstance */
-		foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
-			$oExtensionInstance->LogOperation($oKPILogData);
-		}
-	}
-
 	/**
 	 * Compute statistics for a call to an extension
 	 * Note: not working in dev mode (with links to env-production)
 	 *
 	 * @param object|string $object object called
-	 * @param string $sMethod method called on the object
-	 * @param string $sMessage additional message
+	 * @param string $sMethod       method called on the object
+	 * @param string $sMessage      additional message
 	 *
 	 * @return bool true if an extension was found for this object::method
 	 * @throws \ReflectionException
@@ -463,23 +423,21 @@ class ExecutionKPI implements iEventServiceSetup
 
 		$fDuration = 0;
 		if (self::$m_bEnabled_Duration) {
-			$fStopped = microtime(true);
+			$fStopped = MyHelpers::getmicrotime();
 			$fDuration = $fStopped - $this->m_fStarted;
 			$aCallstack = [];
 			if (self::$m_bGenerateLegacyReport) {
 				if (self::$m_bBlameCaller) {
 					$aCallstack = MyHelpers::get_callstack(1);
 					self::$m_aStats[$sOperation][$sArguments][] = [
-						'time'    => $fDuration,
-						'callers' => $aCallstack,
+							'time' => $fDuration,
+							'callers' => $aCallstack,
 					];
 				} else {
 					self::$m_aStats[$sOperation][$sArguments][] = [
-						'time' => $fDuration,
+							'time' => $fDuration,
 					];
 				}
-			} else {
-				$aCallstack = ['callstack' => $this->GetCallStack()];
 			}
 
 			$iInitialMemory = is_null($this->m_iInitialMemory) ? 0 : $this->m_iInitialMemory;
@@ -490,45 +448,33 @@ class ExecutionKPI implements iEventServiceSetup
 				$iPeakMemory = self::memory_get_peak_usage();
 			}
 
-			if (static::$bMetamodelStarted) {
-				foreach (static::$aBootstrapOperations as $oLog) {
-					$this->LogOperation($oLog);
-				}
-				static::$aBootstrapOperations = [];
+			// Invoke extensions to log the KPI operation
+			/** @var \iKPILoggerExtension $oExtensionInstance */
+			foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
+				//$sExtension = ModuleService::GetInstance()->GetModuleNameFromCallStack(1);
+				$sExtension = '';
 				$oKPILogData = new KpiLogData(
 					KpiLogData::TYPE_STATS,
 					$sOperation,
 					$sArguments,
 					$this->m_fStarted,
 					$fStopped,
-					'',
+					$sExtension,
 					$iInitialMemory,
 					$iCurrentMemory,
 					$iPeakMemory,
 					$aCallstack
 				);
-				$this->LogOperation($oKPILogData);
-			} else {
-				$oKPILogData = new KpiLogData(
-					KpiLogData::TYPE_STATS,
-					$sOperation,
-					$sArguments,
-					$this->m_fStarted,
-					$fStopped,
-					'',
-					$iInitialMemory,
-					$iCurrentMemory,
-					$iPeakMemory,
-					$aCallstack
-				);
-				static::$aBootstrapOperations[] = $oKPILogData;
+				$oExtensionInstance->LogOperation($oKPILogData);
 			}
 		}
 	}
 
 	protected function ResetCounters()
 	{
-		$this->m_fStarted = microtime(true);
+		if (self::$m_bEnabled_Duration) {
+			$this->m_fStarted = microtime(true);
+		}
 
 		if (self::$m_bEnabled_Memory) {
 			$this->m_iInitialMemory = self::memory_get_usage();
@@ -557,33 +503,7 @@ class ExecutionKPI implements iEventServiceSetup
 		if (function_exists('memory_get_peak_usage')) {
 			return memory_get_peak_usage($bRealUsage);
 		}
-
 		// PHP > 5.2.1 - this verb depends on a compilation option
 		return 0;
 	}
-
-	/*
-	 * ModuleHandlerApiInterface methods
-	 */
-
-	public static function OnMetaModelStarted()
-	{
-		static::$bMetamodelStarted = true;
-	}
-
-	public function RegisterEventsAndListeners()
-	{
-		EventService::RegisterListener(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED, [$this, 'OnMetaModelStarted']);
-	}
-
-	private function GetCallStack(): string
-	{
-		$aCallStack = MyHelpers::get_callstack(2);
-		$sCallStack = "Call stack:\n";
-		foreach ($aCallStack as $index => $aLine) {
-			$sCallStack .= "#$index ".$aLine['File'].'('.$aLine['Line'].'): '.$aLine['Function']."\n";
-		}
-
-		return $sCallStack;
-	}
 }

css/backoffice/layout/multi-column/_multi-column.scss

@@ -5,11 +5,9 @@
 
 $ibo-multi-column--margin-x: -16px !default; /* This is to compensate columns padding and make the whole multicolumn align with the parent borders (cf. Bootstrap rows / cols) */
 $ibo-multi-column--margin-y: $ibo-spacing-0 !default;
-$ibo-multi-column--row-gap: $ibo-spacing-800 !default;
 
 .ibo-multi-column {
   display: flex;
   flex-wrap: wrap;
   margin: $ibo-multi-column--margin-y $ibo-multi-column--margin-x;
-  row-gap: $ibo-multi-column--row-gap;
 }

datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php

@@ -19,7 +19,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:FAQ/Attribute:summary+' => '',
 	'Class:FAQ/Attribute:description' => 'Description',
 	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Catégorie',
+	'Class:FAQ/Attribute:category_id' => 'Categorie',
 	'Class:FAQ/Attribute:category_id+' => '',
 	'Class:FAQ/Attribute:category_name' => 'Nom catégorie',
 	'Class:FAQ/Attribute:category_name+' => '',

datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php

@@ -1394,12 +1394,8 @@ class ObjectController extends BrickController
 					$sValue = $oFieldOutput->GetHtml();
 				}
 				$aObjectData['attributes']['lnk__'.$sAttCode] = [
-					'object_class'   => $sLinkClass,
-					'object_id'      => $oNewLink->GetKey(),
-					'prefix'         => 'lnk__',
-					'attribute_code' => $sAttCode,
-					'attribute_type' => get_class($oAttDef),
-					'value_html'     => $sValue,
+					'att_code'   => $sAttCode,
+					'value'      => $sValue,
 					'css_inline' => $oFieldOutput->GetCss(),
 					'js_inline'  => $oFieldOutput->GetJs(),
 				];

datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml

@@ -238,11 +238,6 @@
               <action id="action:bulk delete">allow</action>
             </actions>
           </group>
-          <group id="Ticketing">
-            <actions>
-              <action id="stimulus:ev_close">allow</action>
-            </actions>
-          </group>
           <group id="UserRequest">
             <actions>
               <action id="stimulus:ev_approve">allow</action>
@@ -259,10 +254,8 @@
           <group id="Incident">
             <actions>
               <action id="stimulus:ev_assign">allow</action>
-              <action id="stimulus:ev_dispatch">allow</action>
               <action id="stimulus:ev_reassign">allow</action>
               <action id="stimulus:ev_resolve">allow</action>
-              <action id="stimulus:ev_reopen">allow</action>
               <action id="stimulus:ev_close">allow</action>
               <action id="stimulus:ev_pending">allow</action>
             </actions>

sources/Core/Kpi/KpiLogData.php

@@ -9,8 +9,8 @@ namespace Combodo\iTop\Core\Kpi;
 
 class KpiLogData
 {
-	public const TYPE_REPORT  = 'report';
-	public const TYPE_STATS   = 'stats';
+	public const TYPE_REPORT = 'report';
+	public const TYPE_STATS = 'stats';
 	public const TYPE_REQUEST = 'request';
 
 	/** @var string */
@@ -33,8 +33,6 @@ class KpiLogData
 	public $iPeakMemory;
 	/** @var array */
 	public $aData;
-	// Computed
-	public string $sDuration;
 
 	/**
 	 * @param string $sType
@@ -45,10 +43,9 @@ class KpiLogData
 	 * @param string $sExtension
 	 * @param int $iInitialMemory
 	 * @param int $iCurrentMemory
-	 * @param int $iPeakMemory
 	 * @param array $aData
 	 */
-	public function __construct($sType, $sOperation, $sArguments, float $fStartTime, float $fStopTime, $sExtension, $iInitialMemory = 0, $iCurrentMemory = 0, $iPeakMemory = 0, $aData = [])
+	public function __construct($sType, $sOperation, $sArguments, $fStartTime, $fStopTime, $sExtension, $iInitialMemory = 0, $iCurrentMemory = 0, $iPeakMemory = 0, $aData = [])
 	{
 		$this->sType = $sType;
 		$this->sOperation = $sOperation;
@@ -60,7 +57,6 @@ class KpiLogData
 		$this->iCurrentMemory = $iCurrentMemory;
 		$this->iPeakMemory = $iPeakMemory;
 		$this->aData = $aData;
-		$this->sDuration = sprintf('%01.3f', $fStopTime - $fStartTime);
 	}
 
 	/**
@@ -70,22 +66,21 @@ class KpiLogData
 	 */
 	public static function GetCSVHeader()
 	{
-		return 'Type,Operation,Arguments,StartTime,StopTime,Duration,Extension,InitialMemory,CurrentMemory,PeakMemory';
+		return "Type,Operation,Arguments,StartTime,StopTime,Duration,Extension,InitialMemory,CurrentMemory,PeakMemory";
 	}
 
 	/**
 	 * Return the CSV line for the values
-	 *
 	 * @return string
 	 */
 	public function GetCSV()
 	{
+		$fDuration = sprintf('%01.4f', $this->fStopTime - $this->fStartTime);
 		$sType = $this->RemoveQuotes($this->sType);
 		$sOperation = $this->RemoveQuotes($this->sOperation);
 		$sArguments = $this->RemoveQuotes($this->sArguments);
 		$sExtension = $this->RemoveQuotes($this->sExtension);
-
-		return "\"$sType\",\"$sOperation\",\"$sArguments\",$this->fStartTime,$this->fStopTime,$this->sDuration,\"$sExtension\",$this->iInitialMemory,$this->iCurrentMemory,$this->iPeakMemory";
+		return "\"$sType\",\"$sOperation\",\"$sArguments\",$this->fStartTime,$this->fStopTime,$fDuration,\"$sExtension\",$this->iInitialMemory,$this->iCurrentMemory,$this->iPeakMemory";
 	}
 
 	private function RemoveQuotes(string $sEntry): string
@@ -103,7 +98,6 @@ class KpiLogData
 		if ($oOther->fStartTime > $this->fStartTime) {
 			return -1;
 		}
-
 		return 1;
 	}
 

tests/php-static-analysis/composer.json

@@ -1,5 +1,5 @@
 {
    "require": {
-    "phpstan/phpstan": "^2.1"
+    "phpstan/phpstan": "^1.10"
   }
 }

tests/php-static-analysis/composer.lock

@@ -4,19 +4,24 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cc6d7580a5e98236d68d8b91de9ddebb",
+    "content-hash": "14812c2a05a5972f00f9d67abbd710a9",
     "packages": [
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.33",
+            "version": "1.10.26",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f"
+            },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9e800e6bee7d5bd02784d4c6069b48032d16224f",
-                "reference": "9e800e6bee7d5bd02784d4c6069b48032d16224f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5d660cbb7e1b89253a47147ae44044f49832351f",
+                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4|^8.0"
+                "php": "^7.2|^8.0"
             },
             "conflict": {
                 "phpstan/phpstan-shim": "*"
@@ -55,9 +60,13 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-12-05T10:24:31+00:00"
+            "time": "2023-07-19T12:44:37+00:00"
         }
     ],
     "packages-dev": [],
@@ -68,5 +77,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }

tests/php-static-analysis/config/base.dist.neon

@@ -5,8 +5,8 @@ includes:
 
 parameters:
     level: 0
-    #phpVersion: null                                           # Explicitly commented as we rather use the detected version from the above include (`php-includes/target-php-version.php`)
-    editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'    # Open in PHPStorm as it's Combodo's default IDE
+    #phpVersion: null                   # Explicitly commented as we rather use the detected version from the above include (`php-includes/target-php-version.php`)
+    editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'    # Open in PHPStorm asit is Combodo's default IDE
     bootstrapFiles:
         - ../../../approot.inc.php
         - ../../../bootstrap.inc.php
@@ -22,19 +22,11 @@ parameters:
             - ../../../lib              # Irrelevant as we only want to analyze our codebase
             - ../../../node_modules     # Irrelevant as we only want to analyze our codebase
         analyseAndScan:
-            # This file generates "unignorable errors" for the baseline due to its format, so we don't have any other choice than to exclude it.
-            # But mind that it will prevent PHPStan from warning us about PHP syntax errors in this file.
-            - ../../../core/oql/build/PHP/Lempar.php
-
-            #- ../../../data                        # Left and commented on purpose to show that we want to analyse the generated cache files
-
-            # Note 1: We can't analyse these folders as if a PHP file requires another PHP element declared in an XML file, it won't find it. So we rely only on `env-production`
+            #- ../../../data            # Left and commented on purpose to show that we want to analyse the generated cache files
+            # Note 1: We can analyse these folders as if a PHP file requires another PHP element declared in an XML file, it won't find it. So we rely only on `env-production`
             # Note 2: Only the options selected during the setup will be analysed correctly in `env-production`. For unselected options, we still want to ignore them during the analysis as they would only give a false sentiment of security as their XML PHP classes / snippets / etc would not be tested.
-            - ../../../data/production-modules (?)  # Irrelevent as it will already be in `env-production` (for local run only, not useful in the CI)
-            - ../../../datamodels                   # Irrelevent as it will already be in `env-production`
-            - ../../../extensions                   # Irrelevent as it will already be in `env-production` (for local run only, not useful in the CI)
-            - ../../../env-php-unit-tests (?)       # Irrelevant as it will either already be in `env-production` or might be desynchronized from `env-production`
-            - ../../../env-toolkit (?)              # Irrelevent as it will either already be in `env-production` or might be desynchronized from `env-production` (for local run only, not useful in the CI)
-
-            - ../../../tests (?)                    # Exclude tests for now
-            - ../../../toolkit (?)                  # Exlclude toolkit for now
+            - ../../../data/production-modules  # Irrelevent as it will already be in `env-production` (for local run only, not useful in the CI)
+            - ../../../datamodels       # Irrelevent as it will already be in `env-production`
+            - ../../../extensions       # Irrelevent as it will already be in `env-production` (for local run only, not useful in the CI)
+            - ../../../tests            # Exclude tests for now
+            - ../../../toolkit          # Exlclude toolkit for now

tests/php-static-analysis/config/php-includes/set-php-version-from-process.php

@@ -1,11 +1,10 @@
 <?php
-
 /*
  * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * This file is only here to allow setting a specific PHP version to run the analysis for without
@@ -22,4 +21,4 @@ declare(strict_types=1);
 $config = [];
 $config['parameters']['phpVersion'] = PHP_VERSION_ID;
 
-return $config;
+return $config;

tests/php-unit-tests/README.md

@@ -2,6 +2,9 @@
 
 Documentation on creating and maintaining tests in iTop.
 
+
+
+
 ## Prerequisites
 
 ### PHPUnit configuration file
@@ -75,8 +78,7 @@ Example :
 		$oTagData->DBDelete();
 ```
 
-> [!WARNING]
-> When the condition is met the test is finished and following code will be ignored !
+Warning : when the condition is met the test is finished and following code will be ignored !
 
 Another way to do is using try/catch blocks, for example :
 ```php

tests/php-unit-tests/integration-tests/itop-hub-connector/AjaxPageTest.php

@@ -28,14 +28,14 @@ class AjaxPageTest extends ItopDataTestCase
 		$iLastCompilation = filemtime(APPROOT.'env-production');
 
 		// When
-		$sOutput = $this->CallItopUri(
-			"pages/exec.php?exec_module=itop-hub-connector&exec_page=ajax.php",
+		$sOutput = $this->CallItopUrl(
+			"/pages/exec.php?exec_module=itop-hub-connector&exec_page=ajax.php",
 			[
 				'auth_user' => $sLogin,
 				'auth_pwd' => self::AUTHENTICATION_PASSWORD,
 				'operation' => 	"compile",
 				'authent' => self::AUTHENTICATION_TOKEN,
-			],
+			]
 		);
 
 		// Then
@@ -53,4 +53,26 @@ class AjaxPageTest extends ItopDataTestCase
 		clearstatcache();
 		$this->assertGreaterThan($iLastCompilation, filemtime(APPROOT.'env-production'), 'The env-production directory should have been rebuilt');
 	}
+
+	protected function CallItopUrl($sUri, ?array $aPostFields = null, bool $bXDebugEnabled = false)
+	{
+		$ch = curl_init();
+		if ($bXDebugEnabled) {
+			curl_setopt($ch, CURLOPT_COOKIE, 'XDEBUG_SESSION=phpstorm');
+		}
+
+		$sUrl = \MetaModel::GetConfig()->Get('app_root_url')."/$sUri";
+		var_dump($sUrl);
+		curl_setopt($ch, CURLOPT_URL, $sUrl);
+		curl_setopt($ch, CURLOPT_POST, 1);// set post data to true
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $aPostFields);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+		$sOutput = curl_exec($ch);
+		//echo "$sUrl error code:".curl_error($ch);
+		curl_close($ch);
+
+		return $sOutput;
+	}
 }

tests/php-unit-tests/legacy-tests/display_cache_content.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright (C) 2013-2024 Combodo SAS
  *
@@ -25,15 +24,19 @@
 require_once('../../../approot.inc.php');
 require_once(APPROOT.'application/startup.inc.php');
 
+
 $sEnvironment = MetaModel::GetEnvironmentId();
-$aEntries = [];
+$aEntries = array();
 $aCacheUserData = apc_cache_info_compat();
-if (is_array($aCacheUserData) && isset($aCacheUserData['cache_list'])) {
+if (is_array($aCacheUserData) && isset($aCacheUserData['cache_list']))
+{
 	$sPrefix = 'itop-'.$sEnvironment.'-query-cache-';
 
-	foreach ($aCacheUserData['cache_list'] as $i => $aEntry) {
+	foreach($aCacheUserData['cache_list'] as $i => $aEntry)
+	{
 		$sEntryKey = array_key_exists('info', $aEntry) ? $aEntry['info'] : $aEntry['key'];
-		if (strpos($sEntryKey, $sPrefix) === 0) {
+		if (strpos($sEntryKey, $sPrefix) === 0)
+		{
 			$aEntries[] = $sEntryKey;
 		}
 	}
@@ -41,39 +44,52 @@ if (is_array($aCacheUserData) && isset($aCacheUserData['cache_list'])) {
 
 echo "<pre>";
 
-if (empty($aEntries)) {
+if (empty($aEntries))
+{
 	echo "No Data";
 	return;
 }
 
 $sKey = $aEntries[0];
 $result = apc_fetch($sKey);
-if (!is_object($result)) {
+if (!is_object($result))
+{
 	return;
 }
 $oSQLQuery = $result;
 
 echo "NB Tables before;NB Tables after;";
-foreach ($oSQLQuery->m_aContextData as $sField => $oValue) {
+foreach($oSQLQuery->m_aContextData as $sField => $oValue)
+{
 	echo $sField.';';
 }
 echo "\n";
 
 sort($aEntries);
 
-foreach ($aEntries as $sKey) {
+foreach($aEntries as $sKey)
+{
 	$result = apc_fetch($sKey);
-	if (is_object($result)) {
+	if (is_object($result))
+	{
 		$oSQLQuery = $result;
-		if (isset($oSQLQuery->m_aContextData)) {
+		if (isset($oSQLQuery->m_aContextData))
+		{
 			echo $oSQLQuery->m_iOriginalTableCount.";".$oSQLQuery->CountTables().';';
-			foreach ($oSQLQuery->m_aContextData as $oValue) {
-				if (is_array($oValue)) {
+			foreach($oSQLQuery->m_aContextData as $oValue)
+			{
+				if (is_array($oValue))
+				{
 					$sVal = json_encode($oValue);
-				} else {
-					if (empty($oValue)) {
+				}
+				else
+				{
+					if (empty($oValue))
+					{
 						$sVal = '';
-					} else {
+					}
+					else
+					{
 						$sVal = $oValue;
 					}
 				}
@@ -85,3 +101,4 @@ foreach ($aEntries as $sKey) {
 }
 
 echo "</pre>";
+

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

@@ -18,7 +18,6 @@ use ArchivedObjectException;
 use CMDBObject;
 use CMDBSource;
 use Combodo\iTop\Service\Events\EventService;
-use Config;
 use Contact;
 use DBObject;
 use DBObjectSet;
@@ -66,9 +65,6 @@ abstract class ItopDataTestCase extends ItopTestCase
 	private $aCreatedObjects = [];
 	private $aEventListeners = [];
 
-	protected ?string $sConfigTmpBackupFile = null;
-	protected ?Config $oiTopConfig = null;
-
 	/**
 	 * @var bool When testing with silo, there are some cache we need to update on tearDown. Doing it all the time will cost too much, so it's opt-in !
 	 * @see tearDown
@@ -123,8 +119,6 @@ abstract class ItopDataTestCase extends ItopTestCase
 	{
 		parent::setUp();
 
-		\IssueLog::Error($this->getName());
-
 		$this->PrepareEnvironment();
 
 		if (static::USE_TRANSACTION) {
@@ -191,8 +185,6 @@ abstract class ItopDataTestCase extends ItopTestCase
 
 		CMDBObject::SetCurrentChange(null);
 
-		$this->RestoreConfiguration();
-
 		parent::tearDown();
 	}
 
@@ -1442,35 +1434,4 @@ abstract class ItopDataTestCase extends ItopTestCase
 		$oObject->Set($sStopwatchAttCode, $oStopwatch);
 	}
 
-	protected function BackupConfiguration(): void
-	{
-		$sConfigPath = MetaModel::GetConfig()->GetLoadedFile();
-		clearstatcache();
-		echo sprintf("rights via ls on %s:\n %s \n", $sConfigPath, exec("ls -al $sConfigPath"));
-		$sFilePermOutput = substr(sprintf('%o', fileperms('/etc/passwd')), -4);
-		echo sprintf("rights via fileperms on %s:\n %s \n", $sConfigPath, $sFilePermOutput);
-
-		$this->sConfigTmpBackupFile = tempnam(sys_get_temp_dir(), "config_");
-		MetaModel::GetConfig()->WriteToFile($this->sConfigTmpBackupFile);
-		$this->oiTopConfig = new Config($sConfigPath);
-	}
-
-	protected function RestoreConfiguration(): void
-	{
-		if (is_null($this->sConfigTmpBackupFile) || ! is_file($this->sConfigTmpBackupFile)) {
-			return;
-		}
-
-		if (is_null($this->oiTopConfig)) {
-			return;
-		}
-
-		//put config back
-		$sConfigPath = $this->oiTopConfig->GetLoadedFile();
-		@chmod($sConfigPath, 0770);
-		$oConfig = new Config($this->sConfigTmpBackupFile);
-		$oConfig->WriteToFile($sConfigPath);
-		@chmod($sConfigPath, 0440);
-		@unlink($this->sConfigTmpBackupFile);
-	}
 }

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

@@ -10,9 +10,9 @@ namespace Combodo\iTop\Test\UnitTest;
 use CMDBSource;
 use DeprecatedCallsLog;
 use MySQLTransactionNotClosedException;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use ReflectionMethod;
 use SetupUtils;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 use const DEBUG_BACKTRACE_IGNORE_ARGS;
@@ -28,7 +28,6 @@ use const DEBUG_BACKTRACE_IGNORE_ARGS;
 abstract class ItopTestCase extends KernelTestCase
 {
 	public const TEST_LOG_DIR = 'test';
-	protected array $aFileToClean = [];
 
 	/**
 	 * @var bool
@@ -37,7 +36,7 @@ abstract class ItopTestCase extends KernelTestCase
 	public const DISABLE_DEPRECATEDCALLSLOG_ERRORHANDLER = true;
 	public static $DEBUG_UNIT_TEST = false;
 	protected static $aBackupStaticProperties = [];
-	public ?array $aLastCurlGetInfo = null;
+
 	/**
 	 * @link https://docs.phpunit.de/en/9.6/annotations.html#preserveglobalstate PHPUnit `preserveGlobalState` annotation documentation
 	 *
@@ -150,17 +149,6 @@ abstract class ItopTestCase extends KernelTestCase
 	{
 		parent::setUp();
 
-		// Check globals
-		global $fItopStarted;
-		if (is_null($fItopStarted)) {
-			$fItopStarted = microtime(true);
-		}
-
-		global $iItopInitialMemory;
-		if (is_null($iItopInitialMemory)) {
-			$iItopInitialMemory = memory_get_usage(true);
-		}
-
 		// Hack - Required the first time the Portal kernel is booted on a newly installed iTop
 		$_ENV['COMBODO_PORTAL_BASE_ABSOLUTE_PATH'] = __DIR__.'/../../../../../env-production/itop-portal-base/portal/public/';
 
@@ -186,15 +174,6 @@ abstract class ItopTestCase extends KernelTestCase
 			}
 			throw new MySQLTransactionNotClosedException('Some DB transactions were opened but not closed ! Fix the code by adding ROLLBACK or COMMIT statements !', []);
 		}
-
-		foreach ($this->aFileToClean as $sPath) {
-			if (is_file($sPath)) {
-				@unlink($sPath);
-				continue;
-			}
-
-			SetupUtils::tidydir($sPath);
-		}
 	}
 
 	/**
@@ -652,62 +631,4 @@ abstract class ItopTestCase extends KernelTestCase
 		fclose($handle);
 		return array_reverse($aLines);
 	}
-
-	/**
-	* @param $sUrl
-	* @param array|null $aPostFields
-	* @param array|null $aCurlOptions
-	* @param $bXDebugEnabled
-	* @return string
-	 */
-	protected function CallUrl($sUrl, ?array $aPostFields = [], ?array $aCurlOptions = [], $bXDebugEnabled = false): string
-	{
-		$ch = curl_init();
-		if ($bXDebugEnabled) {
-			curl_setopt($ch, CURLOPT_COOKIE, "XDEBUG_SESSION=phpstorm");
-		}
-
-		curl_setopt($ch, CURLOPT_URL, $sUrl);
-		curl_setopt($ch, CURLOPT_POST, 1);// set post data to true
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		// Force disable of certificate check as most of dev / test env have a self-signed certificate
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-		curl_setopt_array($ch, $aCurlOptions);
-		if ($this->IsArrayOfArray($aPostFields)) {
-			curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($aPostFields));
-		} else {
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $aPostFields);
-		}
-
-		$sOutput = curl_exec($ch);
-
-		$info = curl_getinfo($ch);
-		$this->aLastCurlGetInfo = $info;
-		$sErrorMsg = curl_error($ch);
-		$iErrorCode = curl_errno($ch);
-		curl_close($ch);
-
-		\IssueLog::Info(__METHOD__, null, ['url' => $sUrl, 'error' => $sErrorMsg, 'error_code' => $iErrorCode, 'post_fields' => $aPostFields, 'info' => $info]);
-
-		return $sOutput;
-	}
-
-	private function IsArrayOfArray(array $aStruct): bool
-	{
-		foreach ($aStruct as $k => $v) {
-			if (is_array($v)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	protected function CallItopUri(string $sUri, ?array $aPostFields = [], ?array $aCurlOptions = [], $bXDebugEnabled = false): string
-	{
-		$sUrl = \MetaModel::GetConfig()->Get('app_root_url')."/$sUri";
-
-		return $this->CallUrl($sUrl, $aPostFields, $aCurlOptions, $bXDebugEnabled);
-	}
 }

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

@@ -0,0 +1,63 @@
+<?php
+
+namespace Combodo\iTop\Test\UnitTest\Application;
+
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use MetaModel;
+
+class LoginTest extends ItopDataTestCase
+{
+	protected $sConfigTmpBackupFile;
+	protected $sConfigPath;
+	protected $sLoginMode;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		clearstatcache();
+
+		// The test consists in requesting UI.php from outside iTop with a specific configuration
+		// Hence the configuration file must be tweaked on disk (and restored)
+		$this->sConfigPath = MetaModel::GetConfig()->GetLoadedFile();
+		$this->sConfigTmpBackupFile = tempnam(sys_get_temp_dir(), "config_");
+		file_put_contents($this->sConfigTmpBackupFile, file_get_contents($this->sConfigPath));
+
+		$oConfig = new \Config($this->sConfigPath);
+		$this->sLoginMode = "unimplemented_loginmode";
+		$oConfig->AddAllowedLoginTypes($this->sLoginMode);
+
+		@chmod($this->sConfigPath, 0770);
+		$oConfig->WriteToFile();
+		@chmod($this->sConfigPath, 0444);
+	}
+
+	protected function tearDown(): void
+	{
+		if (! is_null($this->sConfigTmpBackupFile) && is_file($this->sConfigTmpBackupFile)) {
+			//put config back
+			@chmod($this->sConfigPath, 0770);
+			file_put_contents($this->sConfigPath, file_get_contents($this->sConfigTmpBackupFile));
+			@chmod($this->sConfigPath, 0444);
+			@unlink($this->sConfigTmpBackupFile);
+		}
+		parent::tearDown();
+	}
+
+	protected function CallItopUrlByCurl($sUri, ?array $aPostFields = [])
+	{
+		$ch = curl_init();
+
+		$sUrl = MetaModel::GetConfig()->Get('app_root_url')."/$sUri";
+		curl_setopt($ch, CURLOPT_URL, $sUrl);
+		if (0 !== sizeof($aPostFields)) {
+			curl_setopt($ch, CURLOPT_POST, 1);// set post data to true
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $aPostFields);
+		}
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		$sOutput = curl_exec($ch);
+		curl_close($ch);
+
+		return $sOutput;
+	}
+}

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

@@ -172,12 +172,34 @@ class QueryTest extends ItopDataTestCase
 	{
 		// compute request url
 		$url = 	$oQuery->GetExportUrl();
-		$aCurlOptions = [
-			CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-			CURLOPT_USERPWD => self::USER.':'.self::PASSWORD,
-		];
 
-		return $this->CallUrl($url, [], $aCurlOptions);
+		// 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);
+		// Force disable of certificate check as most of dev / test env have a self-signed certificate
+		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0);
+
+		// execute curl
+		$result = curl_exec($curl);
+		if (curl_errno($curl)) {
+			$info = curl_getinfo($curl);
+			var_export($info);
+			var_dump([
+				'url' => $url,
+				'app_root_url:' => MetaModel::GetConfig()->Get('app_root_url'),
+				'GetAbsoluteUrlAppRoot:' => \utils::GetAbsoluteUrlAppRoot(),
+			]);
+		}
+		// close curl
+		curl_close($curl);
+
+		return $result;
 	}
 
 	/** @inheritDoc */

tests/php-unit-tests/unitary-tests/webservices/CliResetSessionTest.php

@@ -12,8 +12,10 @@ class CliResetSessionTest extends ItopDataTestCase
 	public const USE_TRANSACTION = false;
 
 	private $sCookieFile = "";
+	private $sUrl;
 	private $sLogin;
 	private $sPassword = "Iuytrez9876543ç_è-(";
+	protected $sConfigTmpBackupFile;
 
 	/**
 	 * @throws Exception
@@ -22,13 +24,16 @@ class CliResetSessionTest extends ItopDataTestCase
 	{
 		parent::setUp();
 
-		$this->BackupConfiguration();
+		$this->sConfigTmpBackupFile = tempnam(sys_get_temp_dir(), "config_");
+		MetaModel::GetConfig()->WriteToFile($this->sConfigTmpBackupFile);
 
 		$this->sLogin = "rest-user-".date('dmYHis');
 		$this->CreateTestOrganization();
 
 		$this->sCookieFile = tempnam(sys_get_temp_dir(), 'jsondata_');
 
+		$this->sUrl = \MetaModel::GetConfig()->Get('app_root_url');
+
 		$oRestProfile = \MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", ['name' => 'REST Services User'], true);
 		$oAdminProfile = \MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", ['name' => 'Administrator'], true);
 
@@ -42,6 +47,16 @@ class CliResetSessionTest extends ItopDataTestCase
 	{
 		parent::tearDown();
 
+		if (! is_null($this->sConfigTmpBackupFile) && is_file($this->sConfigTmpBackupFile)) {
+			//put config back
+			$sConfigPath = MetaModel::GetConfig()->GetLoadedFile();
+			@chmod($sConfigPath, 0770);
+			$oConfig = new Config($this->sConfigTmpBackupFile);
+			$oConfig->WriteToFile($sConfigPath);
+			@chmod($sConfigPath, 0444);
+			unlink($this->sConfigTmpBackupFile);
+		}
+
 		if (!empty($this->sCookieFile)) {
 			unlink($this->sCookieFile);
 		}
@@ -135,18 +150,26 @@ class CliResetSessionTest extends ItopDataTestCase
 	 */
 	private function SendHTTPRequestWithCookies($sUri, $aPostFields, $sForcedLoginMode = null): string
 	{
+		$ch = curl_init();
+
+		curl_setopt($ch, CURLOPT_COOKIEJAR, $this->sCookieFile);
+		curl_setopt($ch, CURLOPT_COOKIEFILE, $this->sCookieFile);
+
+		$sUrl = "$this->sUrl/$sUri";
 		if (!is_null($sForcedLoginMode)) {
-			$sUri .= "?login_mode=$sForcedLoginMode";
+			$sUrl .= "?login_mode=$sForcedLoginMode";
 		}
+		curl_setopt($ch, CURLOPT_URL, $sUrl);
+		curl_setopt($ch, CURLOPT_POST, 1);// set post data to true
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $aPostFields);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_HEADER, 1);
+		// Force disable of certificate check as most of dev / test env have a self-signed certificate
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
 
-		$aCurlOptions = [
-			CURLOPT_COOKIEJAR => $this->sCookieFile,
-			CURLOPT_COOKIEFILE => $this->sCookieFile,
-			CURLOPT_HEADER => 1,
-		];
-
-		$sResponse = $this->CallItopUri($sUri, $aPostFields, $aCurlOptions);
-		var_dump($this->aLastCurlGetInfo);
+		$sResponse = curl_exec($ch);
 		/** $sResponse example
 		 *  "HTTP/1.1 200 OK
 		Date: Wed, 07 Jun 2023 05:00:40 GMT
@@ -154,15 +177,16 @@ class CliResetSessionTest extends ItopDataTestCase
 		Set-Cookie: itop-2e83d2e9b00e354fdc528621cac532ac=q7ldcjq0rvbn33ccr9q8u8e953; path=/
 		 */
 		//var_dump($sResponse);
-		$iHeaderSize = $this->aLastCurlGetInfo['header_size'] ?? 0;
+		$iHeaderSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
 		$sBody = substr($sResponse, $iHeaderSize);
 
 		//$iHttpCode = intval(curl_getinfo($ch, CURLINFO_HTTP_CODE));
 		if (preg_match('/HTTP.* (\d*) /', $sResponse, $aMatches)) {
 			$sHttpCode = $aMatches[1];
 		} else {
-			$sHttpCode = $this->aLastCurlGetInfo['http_code'] ?? -1;
+			$sHttpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 		}
+		curl_close($ch);
 
 		$this->assertEquals(200, $sHttpCode, "The test logic assumes that the HTTP request is correctly handled");
 		return $sBody;

tests/php-unit-tests/unitary-tests/webservices/RestTest.php

@@ -17,6 +17,7 @@ class RestTest extends ItopDataTestCase
 	public const USE_TRANSACTION = false;
 	public const CREATE_TEST_ORG = false;
 
+	private static $sUrl;
 	private static $sLogin;
 	private static $sPassword = "Iuytrez9876543ç_è-(";
 
@@ -43,6 +44,7 @@ class RestTest extends ItopDataTestCase
 	{
 		parent::setUp();
 
+		static::$sUrl = MetaModel::GetConfig()->Get('app_root_url');
 		static::$sLogin = "rest-user-".date('dmYHis');
 
 		$this->CreateTestOrganization();
@@ -94,6 +96,7 @@ class RestTest extends ItopDataTestCase
 
 	public function testPostJSONDataAsCurlFile()
 	{
+		$sCallbackName = 'fooCallback';
 		$sJsonData = '{"operation": "list_operations"}';
 
 		// Test regular JSON result
@@ -294,7 +297,16 @@ JSON;
 			$aPostFields['callback'] = $sCallbackName;
 		}
 
-		$sJson = $this->CallItopUri('webservices/rest.php', $aPostFields);
+		curl_setopt($ch, CURLOPT_URL, static::$sUrl."/webservices/rest.php");
+		curl_setopt($ch, CURLOPT_POST, 1);// set post data to true
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $aPostFields);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		// Force disable of certificate check as most of dev / test env have a self-signed certificate
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+
+		$sJson = curl_exec($ch);
+		curl_close($ch);
 
 		if (!is_null($sTmpFile)) {
 			unlink($sTmpFile);