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

# Conflicts:
#	tests/php-unit-tests/ItopTestCase.php
This commit is contained in:
Pierre Goiffon
2023-05-05 09:45:02 +02:00
4 changed files with 79 additions and 6 deletions

View File

@@ -25,4 +25,9 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.1');
*/
define('ITOP_CORE_VERSION', '3.1.0');
/**
* @since 3.0.4 N°6274 Allow to test if PHPUnit is currently running. Starting with PHPUnit 9.5 we'll be able to replace it with $GLOBALS['phpunit_version']
*/
define('ITOP_PHPUNIT_RUNNING_CONSTANT_NAME', 'ITOP_PHPUNIT_RUNNING');
require_once APPROOT.'bootstrap.inc.php';