composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-04 16:44:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Espie
2024-10-29 11:18:45 +01:00
parent eb992c7b45 6ae8a72a35
commit 58c68bade9
24 changed files with 151 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
View File

@@ -151,6 +151,10 @@ abstract class ItopDataTestCase extends ItopTestCase
static::SetNonPublicStaticProperty(\cmdbAbstractObject::class, 'aObjectsAwaitingEventDbLinksChanged', []);
\cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
// disconnection before object deletions. make sure to have enough rights to proceed (especially with user object)
if (UserRights::IsLoggedIn()) {
UserRights::Logoff();
}
if (static::USE_TRANSACTION) {
$this->debug("ROLLBACK !!!");
CMDBSource::Query('ROLLBACK');
@@ -175,10 +179,6 @@ abstract class ItopDataTestCase extends ItopTestCase
// As soon as a rollback has been performed, each object memoized should be discarded
CMDBObject::SetCurrentChange(null);
// Leave the place clean
if (UserRights::IsLoggedIn()) {
UserRights::Logoff();
}
$this->SetNonPublicStaticProperty(UserRights::class, 'm_aCacheUsers', []); // we could have cached rollbacked instances
if ($this->bIsUsingSilo) {
$this->ResetMetaModelQueyCacheGetObject();