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

# Conflicts:
#	tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
This commit is contained in:
Pierre Goiffon
2023-11-16 11:29:31 +01:00
3 changed files with 4 additions and 5 deletions

View File

@@ -37,6 +37,7 @@ use Ticket;
use URP_UserProfile;
use User;
use UserRequest;
use UserRights;
use utils;
use VirtualHost;
use VirtualMachine;
@@ -141,6 +142,7 @@ abstract class ItopDataTestCase extends ItopTestCase
// Leave the place clean
\UserRights::Logoff();
$this->SetNonPublicStaticProperty(UserRights::class, 'm_aCacheUsers', []);
foreach ($this->aEventListeners as $sListenerId) {
EventService::UnRegisterListener($sListenerId);