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

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

Browse Source 
# Conflicts:
#	tests/setup_params/default-params.xml
This commit is contained in:
Eric Espie
2023-06-08 14:33:54 +02:00
parent f47133bc28 4f999de844
commit e288af4ddb
3 changed files with 406 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/php-unit-tests/ItopDataTestCase.php
View File

@@ -46,6 +46,7 @@ use Server;
use TagSetFieldData;
use Ticket;
use URP_UserProfile;
use User;
use VirtualHost;
use VirtualMachine;
use XMLDataLoader;
@@ -456,7 +457,7 @@ class ItopDataTestCase extends ItopTestCase
/** @var DBObjectSet $oSet */
$oSet = $oUser->Get('profile_list');
$oSet->AddObject($oUserProfile);
$oUser = $this->updateObject('User', $oUser->GetKey(), array(
$oUser = $this->updateObject(User::class, $oUser->GetKey(), array(
'profile_list' => $oSet,
));
$this->debug("Updated {$oUser->GetName()} ({$oUser->GetKey()})");