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

fix ci: test broken when dir to scan did not exist like production-modules

Browse Source
This commit is contained in:
odain
2025-09-11 17:32:06 +02:00
parent dda99616a5
commit 8a017b6e95
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
setup/module/iTopModulesDependencyValidationService.php
View File

@@ -50,20 +50,28 @@ class iTopModulesDependencyValidationService {
glob(APPROOT.'data/extensions/*', GLOB_ONLYDIR);
$aDirsToScan = array_merge([
APPROOT.'datamodels/2.x',
APPROOT.'extensions',
APPROOT.'data/production-modules',
],
glob(APPROOT.'data/production-modules/*', GLOB_ONLYDIR),
glob(APPROOT.'data/extensions/*', GLOB_ONLYDIR)
);
$aMainFolders = [
APPROOT.'datamodels/2.x',
APPROOT.'extensions',
APPROOT.'data/production-modules',
];
foreach (ModuleDiscovery::GetAvailableModules($aDirsToScan, true) as $sModuleId => $aModuleData) {
list($sModuleName,) = \ModuleDiscovery::GetModuleName($sModuleId);
self::$aModulesDataByModuleName[$sModuleName] = $aModuleData;
$aDirsToScan = [];
foreach ($aMainFolders as $sDir){
if (is_dir($sDir)){
$aDirsToScan = array_merge(
$aDirsToScan,
[$sDir],
glob(APPROOT."$sDir/*", GLOB_ONLYDIR)
);
}
}
foreach (ModuleDiscovery::GetAvailableModules($aDirsToScan, true) as $sModuleId => $aModuleData) {
list($sModuleName,) = \ModuleDiscovery::GetModuleName($sModuleId);
self::$aModulesDataByModuleName[$sModuleName] = $aModuleData;
}
}
}
return self::$aModulesDataByModuleName;
}