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

rename ModuleXXX classes by iTopCoreModuleXXX to reduce collisions with extensions

Browse Source
This commit is contained in:
odain
2025-03-24 14:59:13 +01:00
parent bb16108f04
commit 78e13fffb4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
setup/modulediscovery.class.inc.php Normal file → Executable file
View File

@@ -71,7 +71,7 @@ HTML;
/** /**
* Class that handles a module dependency * Class that handles a module dependency
*/ */
class ModuleDependency { class iTopCoreModuleDependency {
private array $aPotentialPrerequisites; private array $aPotentialPrerequisites;
private array $aParamsPerModuleId; private array $aParamsPerModuleId;
private string $sDepString; private string $sDepString;
@@ -188,7 +188,7 @@ class ModuleDependency {
/** /**
* Class that handles a modules and all its dependencies * Class that handles a modules and all its dependencies
*/ */
class Module { class iTopCoreModule {
private string $sModuleId; private string $sModuleId;
private string $sModuleName; private string $sModuleName;
private string $sVersion; private string $sVersion;
@@ -241,7 +241,7 @@ class Module {
$this->aOngoingDependencies = []; $this->aOngoingDependencies = [];
foreach ($aAllDependencies as $sDepString){ foreach ($aAllDependencies as $sDepString){
$this->aOngoingDependencies[$sDepString]= new ModuleDependency($sDepString); $this->aOngoingDependencies[$sDepString]= new iTopCoreModuleDependency($sDepString);
} }
} }
@@ -258,7 +258,7 @@ class Module {
$bDependenciesSolved = true; $bDependenciesSolved = true;
foreach($this->aOngoingDependencies as $sDepId => $oModuleDependency) foreach($this->aOngoingDependencies as $sDepId => $oModuleDependency)
{ {
/** @var ModuleDependency $oModuleDependency*/ /** @var iTopCoreModuleDependency $oModuleDependency*/
if (!$oModuleDependency->IsDependencyResolved($aModuleVersions, $aSelectedModules)) if (!$oModuleDependency->IsDependencyResolved($aModuleVersions, $aSelectedModules))
{ {
$aNextDependencies[$sDepId]=$oModuleDependency; $aNextDependencies[$sDepId]=$oModuleDependency;
@@ -283,7 +283,7 @@ class Module {
{ {
$aRes=[]; $aRes=[];
foreach($this->aOngoingDependencies as $sDepId => $oModuleDependency) { foreach($this->aOngoingDependencies as $sDepId => $oModuleDependency) {
/** @var ModuleDependency $oModuleDependency */ /** @var iTopCoreModuleDependency $oModuleDependency */
$aRes = array_merge($aRes, $oModuleDependency->GetPotentialPrerequisiteModuleNames()); $aRes = array_merge($aRes, $oModuleDependency->GetPotentialPrerequisiteModuleNames());
} }
@@ -462,13 +462,13 @@ class ModuleDiscovery
$aDependsOnModuleName=[]; $aDependsOnModuleName=[];
foreach($aUnresolvedDependencyModules as $sModuleId => $oModule) { foreach($aUnresolvedDependencyModules as $sModuleId => $oModule) {
/** @var Module $oModule */ /** @var iTopCoreModule $oModule */
$aDependsOnModuleName[$oModule->GetModuleName()]=[]; $aDependsOnModuleName[$oModule->GetModuleName()]=[];
} }
foreach ($aUnresolvedDependencyModules as $sModuleId => $oModule) { foreach ($aUnresolvedDependencyModules as $sModuleId => $oModule) {
$iInDegreeCounter = 0; $iInDegreeCounter = 0;
/** @var Module $oModule */ /** @var iTopCoreModule $oModule */
$aUnresolvedDependencyModuleNames = $oModule->GetUnresolvedDependencyModuleNames(); $aUnresolvedDependencyModuleNames = $oModule->GetUnresolvedDependencyModuleNames();
foreach ($aUnresolvedDependencyModuleNames as $sModuleName) { foreach ($aUnresolvedDependencyModuleNames as $sModuleName) {
if (array_key_exists($sModuleName, $aDependsOnModuleName)) { if (array_key_exists($sModuleName, $aDependsOnModuleName)) {
@@ -549,7 +549,7 @@ class ModuleDiscovery
$aSelectedModules = []; $aSelectedModules = [];
foreach($aModules as $sModuleId => $aModule) foreach($aModules as $sModuleId => $aModule)
{ {
$oModule = new Module($sModuleId); $oModule = new iTopCoreModule($sModuleId);
$sModuleName = $oModule->GetModuleName(); $sModuleName = $oModule->GetModuleName();
if (is_null($aModulesToLoad) || in_array($sModuleName, $aModulesToLoad)) if (is_null($aModulesToLoad) || in_array($sModuleName, $aModulesToLoad))
{ {
@@ -571,7 +571,7 @@ class ModuleDiscovery
$iPreviousLoopDepencyCount=$iNextLoopCount; $iPreviousLoopDepencyCount=$iNextLoopCount;
foreach($aUnresolvedDependencyModules as $sModuleId => $oModule) foreach($aUnresolvedDependencyModules as $sModuleId => $oModule)
{ {
/** @var Module $oModule */ /** @var iTopCoreModule $oModule */
if ($oModule->IsModuleResolved($aModuleVersions, $aSelectedModules)){ if ($oModule->IsModuleResolved($aModuleVersions, $aSelectedModules)){
$aOrderedModules[] = $sModuleId; $aOrderedModules[] = $sModuleId;
$aModuleVersions[$oModule->GetModuleName()] = $oModule->GetVersion(); $aModuleVersions[$oModule->GetModuleName()] = $oModule->GetVersion();
@@ -588,7 +588,7 @@ class ModuleDiscovery
self::SortModulesByCountOfDepencenciesDescending($aUnresolvedDependencyModules); self::SortModulesByCountOfDepencenciesDescending($aUnresolvedDependencyModules);
$aModulesInfo = []; $aModulesInfo = [];
$aModuleDeps = []; $aModuleDeps = [];
/** @var Module $oModule */ /** @var iTopCoreModule $oModule */
foreach($aUnresolvedDependencyModules as $sModuleId => $oModule) foreach($aUnresolvedDependencyModules as $sModuleId => $oModule)
{ {
$aModule = $aModules[$sModuleId]; $aModule = $aModules[$sModuleId];