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

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

Browse Source 
# Conflicts:
#	tests/php-unit-tests/ItopTestCase.php
This commit is contained in:
Pierre Goiffon
2023-05-05 09:45:02 +02:00
parent 53e2d1103a 959ac7e3be
commit 436e6b80db
4 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/php-unit-tests/ItopTestCase.php
View File

@@ -36,8 +36,7 @@ class ItopTestCase extends TestCase
static $DEBUG_UNIT_TEST = false;
/** @noinspection UsingInclusionOnceReturnValueInspection avoid errors for approot includes */
protected function setUp(): void
{
protected function setUp(): void {
$sAppRootRelPath = 'approot.inc.php';
$sDepthSeparator = '../';
for ($iDepth = 0; $iDepth < 8; $iDepth++) {
@@ -52,6 +51,11 @@ class ItopTestCase extends TestCase
static::$DEBUG_UNIT_TEST = getenv('DEBUG_UNIT_TEST');
$this->debug("\n----------\n---------- ".$this->getName()."\n----------\n");
if (false === defined(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME)) {
// setUp might be called multiple times, so protecting the define() call !
define(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME, true);
}
}
/**