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

Merge branch 'support/3.2' into develop

Browse Source
This commit is contained in:
odain
2024-11-29 12:09:08 +01:00
parent d85d611642 bd1d447677
commit a65dd1c27c
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php
View File

@@ -137,7 +137,6 @@ abstract class ItopCustomDatamodelTestCase extends ItopDataTestCase
$sConfFile = utils::GetConfigFilePath($sTestEnv);
$sConfFolder = dirname($sConfFile);
if (is_file($sConfFile)) {
chmod($sConfFile, 0777);
SetupUtils::tidydir($sConfFolder);
}

4
tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php
View File

@@ -129,6 +129,10 @@ class UnitTestRunTimeEnvironment extends RunTimeEnvironment
if ($sClass === '') {
continue;
}
if (class_exists($sClass)) {
echo "class $sClass already loaded somehow \n";
continue;
}
require_once $sFile;
$oReflectionClass = new ReflectionClass($sClass);
if ($oReflectionClass->isAbstract()) {