composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 06:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8806 - fix tests

Browse Source
This commit is contained in:
odain
2026-04-08 21:33:10 +02:00
parent fcb497f9a6
commit 20e0d2dec6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup/runtimeenv.class.inc.php
View File

@@ -24,7 +24,6 @@
* @license http://opensource.org/licenses/AGPL-3.0 * @license http://opensource.org/licenses/AGPL-3.0
*/ */
use Combodo\iTop\Application\Helper\Session;
use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator; use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
use Combodo\iTop\Setup\FeatureRemoval\SetupAudit; use Combodo\iTop\Setup\FeatureRemoval\SetupAudit;
use Combodo\iTop\Setup\ModuleDependency\Module; use Combodo\iTop\Setup\ModuleDependency\Module;
@@ -1598,10 +1597,13 @@ class RunTimeEnvironment
return substr_compare($sHaystack, $sNeedle, 0, strlen($sNeedle)) === 0; return substr_compare($sHaystack, $sNeedle, 0, strlen($sNeedle)) === 0;
} }
protected function GetModulesToLoad(string $sSourceEnv, $aSearchDirs): array protected function GetModulesToLoad(string $sSourceEnv, $aSearchDirs): ?array
{ {
$oSourceConfig = new Config(utils::GetConfigFilePath($sSourceEnv)); $oSourceConfig = new Config(utils::GetConfigFilePath($sSourceEnv));
$aChoices = iTopExtensionsMap::GetChoicesFromDatabase($oSourceConfig); $aChoices = iTopExtensionsMap::GetChoicesFromDatabase($oSourceConfig);
if (false === $aChoices) {
return null;
}
$sSourceDir = $oSourceConfig->Get('source_dir'); $sSourceDir = $oSourceConfig->Get('source_dir');
$sInstallFilePath = APPROOT.$sSourceDir.'/installation.xml'; $sInstallFilePath = APPROOT.$sSourceDir.'/installation.xml';