composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle extensions with missing dependencies.

Browse Source 
SVN:trunk[5235]
This commit is contained in:
Denis Flaven
2018-01-11 10:49:18 +00:00
parent 9b6814aee9
commit ea2a3c1980
2 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
setup/extensionsmap.class.inc.php
View File

@@ -2,7 +2,7 @@
require_once(APPROOT.'/setup/parameters.class.inc.php');
require_once(APPROOT.'/core/cmdbsource.class.inc.php');
require_once(APPROOT.'/setup/modulediscovery.class.inc.php');
require_once(APPROOT.'/setup/moduleinstaller.class.inc.php');
/**
* Basic helper class to describe an extension, with some characteristics and a list of modules
*/
@@ -77,6 +77,12 @@ class iTopExtension
*/
public $sSourceDir;
/**
*
* @var string[]
*/
public $aMissingDependencies;
public function __construct()
{
$this->sCode = '';
@@ -88,9 +94,11 @@ class iTopExtension
$this->bMarkedAsChosen = false;
$this->sVersion = ITOP_VERSION;
$this->sInstalledVersion = '';
$this->aModules = array();
$this->aModuleVersion = array();
$this->sSourceDir = '';
$this->bVisible = true;
$this->aMissingDependencies = array();
}
}
@@ -111,6 +119,7 @@ class iTopExtensionsMap
{
$this->aExtensions = array();
$this->ScanDisk($sFromEnvironment);
$this->CheckDependencies($sFromEnvironment);
if ($bNormalizeOldExtensions)
{
$this->NormalizeOldExtensions();
@@ -332,6 +341,57 @@ class iTopExtensionsMap
return false;
}
/**
* Check if some extension contains a module with missing dependencies...
* If so, populate the aMissingDepenencies array
* @param string $sFromEnvironment
* @return void
*/
protected function CheckDependencies($sFromEnvironment)
{
$aSearchDirs = array();
if (is_dir(APPROOT.'/datamodels/2.x'))
{
$aSearchDirs[] = APPROOT.'/datamodels/2.x';
}
else if (is_dir(APPROOT.'/datamodels/1.x'))
{
$aSearchDirs[] = APPROOT.'/datamodels/1.x';
}
$aSearchDirs[] = APPROOT.'/extensions';
$aSearchDirs[] = APPROOT.'/data/'.$sFromEnvironment.'-modules';
try
{
$aAllModules = ModuleDiscovery::GetAvailableModules($aSearchDirs, true);
}
catch(MissingDependencyException $e)
{
// Some modules have missing dependencies
// Let's check what is the impact at the "extensions" level
foreach($this->aExtensions as $sKey => $oExtension)
{
foreach($oExtension->aModules as $sModuleName)
{
if (array_key_exists($sModuleName, $oExtension->aModuleVersion))
{
// This information is not available for pseudo modules defined in the installation wizard, but let's ignore them
$sVersion = $oExtension->aModuleVersion[$sModuleName];
$sModuleId = $sModuleName.'/'.$sVersion;
if (array_key_exists($sModuleId, $e->aModulesInfo))
{
// The extension actually contains a module which has unmet dependencies
$aModuleInfo = $e->aModulesInfo[$sModuleId];
$this->aExtensions[$sKey]->aMissingDependencies = array_merge($oExtension->aMissingDependencies, $aModuleInfo['dependencies']);
}
}
}
}
}
}
/**
* Read the information from a module file (module.xxx.php)
* Closely inspired (almost copied/pasted !!) from ModuleDiscovery::ListModuleFiles

4
setup/wizardsteps.class.inc.php
View File

@@ -1768,7 +1768,7 @@ EOF
foreach($this->oExtensionsMap->GetAllExtensions() as $oExtension)
{
if (($oExtension->sSource !== iTopExtension::SOURCE_WIZARD) && ($oExtension->bVisible))
if (($oExtension->sSource !== iTopExtension::SOURCE_WIZARD) && ($oExtension->bVisible) && (count($oExtension->aMissingDependencies) == 0))
{
$aStepDefinition['options'][] = array(
'extension_code' => $oExtension->sCode,
@@ -1800,7 +1800,7 @@ EOF
);
foreach($this->oExtensionsMap->GetAllExtensions() as $oExtension)
{
if ($oExtension->sSource)
if (($oExtension->bVisible) && (count($oExtension->aMissingDependencies) == 0))
{
$aStepDefinition['options'][] = array(
'extension_code' => $oExtension->sCode,