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

WIP

Browse Source
This commit is contained in:
Timmy38
2026-08-03 17:38:33 +02:00
parent 0c01be9d32
commit e4c3ab005d
4 changed files with 86 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/setuputils.class.inc.php
View File

@@ -1708,9 +1708,9 @@ JS
}
/**
* Build a map of modules that belong to the package base scope.
* Build a map of module IDs that belong to the package base scope.
*
* @param array $aAnalyzeInstallationModules Output from AnalyzeInstallation-like methods
* @param array $aAnalyzeInstallationModules Output from AnalyzeInstallation method
* @param string $sSourceDir Base directory used as package scope
*
* @return array<string, bool>
@@ -1745,13 +1745,8 @@ JS
/**
* Returns true when all modules of a non-package extension are already included in base package modules.
*/
public static function IsIncludedInBasePackage(iTopExtensionsMap $oExtensionsMap, string $sExtensionCode, array $aBasePackageModules): bool
public static function IsIncludedInPackage(?iTopExtension $oExtension, array $aBasePackageModules): bool
{
if ($sExtensionCode === '') {
return false;
}
$oExtension = $oExtensionsMap->GetFromExtensionCode($sExtensionCode);
if (($oExtension === null) || ($oExtension->sSource === iTopExtension::SOURCE_WIZARD)) {
return false;
}