composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Molkobain
2023-03-08 11:04:24 +01:00
parent ec643d1975 4bfc1747b7
commit 559f5b4bdb
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php
View File

@@ -86,7 +86,7 @@ PHP,
<<<PHP
/** @var \ormLinkSet \$ormLinkset */
\$ormLinkset = \$oObject->Get('contacts_list');
\$ormLinkset->AddItem(MetaModel::NewObject('Person', []));
\$ormLinkset->AddItem(MetaModel::NewObject('lnkContactToTicket', []));
\$oObject->Set('contacts_list', \$ormLinkset);
PHP,
false,
@@ -164,7 +164,7 @@ PHP,
'UserLocal',
'password',
<<<PHP
$/** @var \ormPassword \$ormPassword */
/** @var \ormPassword \$ormPassword */
\$ormPassword = new ormPassword('somehash', 'somesalt');
\$oObject->Set('password', \$ormPassword);
PHP,

5
tests/php-unit-tests/unitary-tests/synchro/DataSynchroTest.php
View File

@@ -99,7 +99,10 @@ class DataSynchroTest extends ItopDataTestCase
$sUrl = \MetaModel::GetConfig()->Get('app_root_url').'/synchro/synchro_import.php?login_mode=form';
$sResult = utils::DoPostRequest($sUrl, $aParams, null, $aResponseHeaders, []);
$sResult = utils::DoPostRequest($sUrl, $aParams, null, $aResponseHeaders, [
CURLOPT_SSL_VERIFYPEER => false,
CURLOPT_SSL_VERIFYHOST => 0,
]);
// Read the status code from the last line
$aLines = explode("\n", trim(strip_tags($sResult)));
//$sLastLine = array_pop($aLines);