composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-30 22:18:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/uninstallation

Browse Source
This commit is contained in:
odain
2025-12-19 15:48:56 +01:00
parent 9a8d87e2b5 bf80b5dca2
commit 195038c941
3 changed files with 6 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
View File

@@ -8,7 +8,6 @@
namespace Combodo\iTop\Test\UnitTest;
use CMDBSource;
use DateTime;
use DeprecatedCallsLog;
use MySQLTransactionNotClosedException;
use ReflectionMethod;
@@ -649,7 +648,7 @@ abstract class ItopTestCase extends KernelTestCase
* @param $bXDebugEnabled
* @return string
*/
protected function CallItopUrl($sUrl, ?array $aPostFields = [], ?array $aCurlOptions = [], $bXDebugEnabled = false): string
protected function CallUrl($sUrl, ?array $aPostFields = [], ?array $aCurlOptions = [], $bXDebugEnabled = false): string
{
$ch = curl_init();
if ($bXDebugEnabled) {
@@ -658,20 +657,14 @@ abstract class ItopTestCase extends KernelTestCase
curl_setopt($ch, CURLOPT_URL, $sUrl);
curl_setopt($ch, CURLOPT_POST, 1);// set post data to true
if (!is_array($aPostFields)) {
var_dump($aPostFields);
}
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);
var_dump($aCurlOptions);
curl_setopt_array($ch, $aCurlOptions);
curl_setopt($ch, CURLOPT_POSTFIELDS, $aPostFields);
$sOutput = curl_exec($ch);
//\IssueLog::Info("$sUrl error code:", null, ['error' => curl_error($ch)]);
$info = curl_getinfo($ch);
$this->aLastCurlGetInfo = $info;
@@ -687,6 +680,7 @@ abstract class ItopTestCase extends KernelTestCase
protected function CallItopUri(string $sUri, ?array $aPostFields = [], ?array $aCurlOptions = [], $bXDebugEnabled = false): string
{
$sUrl = \MetaModel::GetConfig()->Get('app_root_url')."/$sUri";
return $this->CallItopUrl($sUrl, $aPostFields, $aCurlOptions, $bXDebugEnabled);
return $this->CallUrl($sUrl, $aPostFields, $aCurlOptions, $bXDebugEnabled);
}
}