Merge branch 'develop' into feature/faf_event_service

This commit is contained in:
Eric Espie
2022-05-25 10:04:54 +02:00
929 changed files with 65776 additions and 34526 deletions

View File

@@ -84,7 +84,7 @@ class ItopDataTestCase extends ItopTestCase
/**
* @throws Exception
*/
protected function setUp()
protected function setUp(): void
{
parent::setUp();
require_once(APPROOT.'application/utils.inc.php');
@@ -108,15 +108,12 @@ class ItopDataTestCase extends ItopTestCase
/**
* @throws Exception
*/
protected function tearDown()
protected function tearDown(): void
{
if (static::USE_TRANSACTION)
{
if (static::USE_TRANSACTION) {
$this->debug("ROLLBACK !!!");
CMDBSource::Query('ROLLBACK');
}
else
{
} else {
$this->debug("");
$this->aCreatedObjects = array_reverse($this->aCreatedObjects);
foreach ($this->aCreatedObjects as $oObject)