Merge branch 'support/3.2' into develop

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

@@ -14,6 +14,7 @@ use ReflectionMethod;
 use SetupUtils;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpKernel\KernelInterface;
+
 use const DEBUG_BACKTRACE_IGNORE_ARGS;
 
 /**
@@ -661,7 +662,11 @@ abstract class ItopTestCase extends KernelTestCase
 		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
 		curl_setopt_array($ch, $aCurlOptions);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($aPostFields));
+		if ($this->IsArrayOfArray($aPostFields)) {
+			curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($aPostFields));
+		} else {
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $aPostFields);
+		}
 
 		$sOutput = curl_exec($ch);
 
@@ -676,6 +681,17 @@ abstract class ItopTestCase extends KernelTestCase
 		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";

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

@@ -94,7 +94,6 @@ class RestTest extends ItopDataTestCase
 
 	public function testPostJSONDataAsCurlFile()
 	{
-		$sCallbackName = 'fooCallback';
 		$sJsonData = '{"operation": "list_operations"}';
 
 		// Test regular JSON result