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

# Conflicts:
#	tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
#	tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
This commit is contained in:
Molkobain
2023-08-11 09:19:49 +02:00
10 changed files with 471 additions and 53 deletions

View File

@@ -5,7 +5,7 @@ namespace Combodo\iTop\Test\UnitTest\Core;
use CMDBSource;
use Combodo\iTop\Test\UnitTest\iTopDataTestCase;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use DateInterval;
use DateTime;
use Expression;
@@ -18,7 +18,7 @@ use ScalarExpression;
* @preserveGlobalState disabled
* @backupGlobals disabled
*/
class ExpressionEvaluateTest extends iTopDataTestCase
class ExpressionEvaluateTest extends ItopDataTestCase
{
const USE_TRANSACTION = false;