N°8760 - module dependency check applied before audit

N°8760 - make dependency check work during audit

N°8760 - fix ci

N°8760 - fix ci

setup/extensionsmap.class.inc.php

@@ -194,7 +194,7 @@ class iTopExtensionsMap
 			}
 		}
 
-		\ModuleDiscovery::DeclareRemovedExtensions($aRemovedExtension);
+		ModuleDiscovery::DeclareRemovedExtensions($aRemovedExtension);
 	}
 
 	/**
@@ -566,6 +566,28 @@ class iTopExtensionsMap
 		}
 	}
 
+	public static function GetChoicesFromDatabase(Config $oConfig): array|false
+	{
+		try {
+			if (CMDBSource::DBName() === null) {
+				CMDBSource::InitFromConfig($oConfig);
+			}
+			$sLatestInstallationDate = CMDBSource::QueryToScalar("SELECT max(installed) FROM ".$oConfig->Get('db_subname')."priv_extension_install");
+			$aDBInfo = CMDBSource::QueryToArray("SELECT * FROM ".$oConfig->Get('db_subname')."priv_extension_install WHERE installed = '".$sLatestInstallationDate."'");
+
+			$aChoices = [];
+			foreach ($aDBInfo as $aExtensionInfo) {
+				$aChoices[] = $aExtensionInfo['label'];
+				;
+			}
+
+			return $aChoices;
+		} catch (MySQLException $e) {
+			// No database or erroneous information
+			return false;
+		}
+	}
+
 	/**
 	 * Tells if the given module name is "chosen" since it is part of a "chosen" extension (in the specified source dir)
 	 * @param string $sModuleNameToFind

setup/feature_removal/DryRemovalRuntimeEnvironment.php

@@ -2,10 +2,15 @@
 
 namespace Combodo\iTop\Setup\FeatureRemoval;
 
+use Combodo\iTop\Setup\ModuleDependency\Module;
+use Config;
+use InstallationChoicesService;
 use iTopExtensionsMap;
 use MetaModel;
+use ModuleDiscovery;
 use RunTimeEnvironment;
 use SetupUtils;
+use utils;
 
 class DryRemovalRuntimeEnvironment extends RunTimeEnvironment
 {
@@ -37,14 +42,22 @@ class DryRemovalRuntimeEnvironment extends RunTimeEnvironment
 
 		$sEnv = $this->sFinalEnv;
 		$this->aExtensionsByCode = $aExtensionCodesToRemove;
-		//SetupUtils::rrmdir(APPROOT."/data/$sEnv-modules");
+
 		$this->Cleanup();
 		SetupUtils::copydir(APPROOT."/data/$sSourceEnv-modules", APPROOT."/data/$sEnv-modules");
 
 		$this->DeclareExtensionAsRemoved($aExtensionCodesToRemove);
+
 		$oDryRemovalConfig = clone(MetaModel::GetConfig());
 		$oDryRemovalConfig->ChangeModulesPath($sSourceEnv, $this->sFinalEnv);
 		$this->WriteConfigFileSafe($oDryRemovalConfig);
+
+		$sSourceDir = $oDryRemovalConfig->Get('source_dir');
+		$aSearchDirs = $this->GetExtraDirsToCompile($sSourceDir);
+
+		$aModulesToLoad = $this->GetModulesToLoad($sSourceEnv, $aSearchDirs);
+
+		ModuleDiscovery::GetAvailableModules($aSearchDirs, true, $aModulesToLoad);
 	}
 
 	private function DeclareExtensionAsRemoved(array $aExtensionCodes): void
@@ -53,6 +66,27 @@ class DryRemovalRuntimeEnvironment extends RunTimeEnvironment
 		$oExtensionsMap->DeclareExtensionAsRemoved($aExtensionCodes);
 	}
 
+	private function GetModulesToLoad(string $sSourceEnv, $aSearchDirs): array
+	{
+		$oSourceConfig = new Config(utils::GetConfigFilePath($sSourceEnv));
+		$aChoices = iTopExtensionsMap::GetChoicesFromDatabase($oSourceConfig);
+		$sSourceDir = $oSourceConfig->Get('source_dir');
+
+		$sInstallFilePath = APPROOT.$sSourceDir.'/installation.xml';
+		if (! is_file($sInstallFilePath)) {
+			$sInstallFilePath = null;
+		}
+
+		$aModuleIdsToLoad = InstallationChoicesService::GetInstance()->GetInstalledModules($aChoices, $aSearchDirs, $sInstallFilePath);
+		$aModulesToLoad = [];
+		foreach ($aModuleIdsToLoad as $sModuleId) {
+			$oModule = new Module($sModuleId);
+			$sModuleName = $oModule->GetModuleName();
+			$aModulesToLoad[] = $sModuleName;
+		}
+		return $aModulesToLoad;
+	}
+
 	public function Cleanup()
 	{
 		$sEnv = $this->sFinalEnv;

setup/modulediscovery.class.inc.php

@@ -96,7 +96,7 @@ class ModuleDiscovery
 	protected static $m_aModuleVersionByName = [];
 
 	/** @var array<\iTopExtension> $m_aRemovedExtensions */
-	protected static $m_aRemovedExtensions = [];
+	protected static array $m_aRemovedExtensions = [];
 
 	// All the entries below are list of file paths relative to the module directory
 	protected static $m_aFilesList = ['datamodel', 'webservice', 'dictionary', 'data.struct', 'data.sample'];
@@ -238,6 +238,7 @@ class ModuleDiscovery
 				}
 			}
 		}
+
 		return ModuleDependencySort::GetInstance()->GetModulesOrderedForInstallation($aFilteredModules, $bAbortOnMissingDependency);
 	}
 
@@ -245,7 +246,7 @@ class ModuleDiscovery
 	* @param array<\iTopExtension> $aRemovedExtension
 	* @return void
 	 */
-	public static function DeclareRemovedExtensions(array $aRemovedExtension)
+	public static function DeclareRemovedExtensions(array $aRemovedExtension): void
 	{
 		if (self::$m_aRemovedExtensions != $aRemovedExtension) {
 			self::ResetCache();
@@ -308,7 +309,19 @@ class ModuleDiscovery
 	{
 		self::Init($aSearchDirs);
 
-		return self::$m_aModules;
+		$aModulesNonRemoved = [];
+		foreach (self::$m_aModules as $sModuleId => $aModuleInfo) {
+			$oModule = new Module($sModuleId);
+			$sModuleName = $oModule->GetModuleName();
+
+			if (self::IsModuleInExtensionList(self::$m_aRemovedExtensions, $sModuleName, $oModule->GetVersion(), $aModuleInfo)) {
+				continue;
+			}
+
+			$aModulesNonRemoved[$sModuleId] = $aModuleInfo;
+		}
+
+		return $aModulesNonRemoved;
 	}
 
 	public static function ResetCache()

setup/runtimeenv.class.inc.php

@@ -33,6 +33,7 @@ require_once APPROOT.'setup/modelfactory.class.inc.php';
 require_once APPROOT.'setup/compiler.class.inc.php';
 require_once APPROOT.'setup/extensionsmap.class.inc.php';
 require_once APPROOT.'setup/moduleinstallation/AnalyzeInstallation.php';
+require_once APPROOT . '/setup/moduleinstallation/InstallationChoicesService.php';
 
 define('MODULE_ACTION_OPTIONAL', 1);
 define('MODULE_ACTION_MANDATORY', 2);
@@ -225,12 +226,29 @@ class RunTimeEnvironment
 		return ($oExtension->sSource == iTopExtension::SOURCE_REMOTE);
 	}
 
+	public function GetExtraDirsToCompile(string $sSourceDir) : array {
+		$sSourceDirFull = APPROOT.$sSourceDir;
+		if (!is_dir($sSourceDirFull)) {
+			throw new Exception("The source directory '$sSourceDirFull' does not exist (or could not be read)");
+		}
+		$aDirsToCompile = [$sSourceDirFull];
+
+		if (is_dir(APPROOT.'extensions')) {
+			$aDirsToCompile[] = APPROOT.'extensions';
+		}
+		$sExtraDir = utils::GetDataPath().$this->sTargetEnv.'-modules/';
+		if (is_dir($sExtraDir)) {
+			$aDirsToCompile[] = $sExtraDir;
+		}
+
+		return $aDirsToCompile;
+	}
+
 	/**
 	 * Get the installed modules (only the installed ones)
 	 */
 	protected function GetMFModulesToCompile($sSourceEnv, $sSourceDir)
 	{
-		\SetupLog::Info(__METHOD__);
 		$sSourceDirFull = APPROOT.$sSourceDir;
 		if (!is_dir($sSourceDirFull)) {
 			throw new Exception("The source directory '$sSourceDirFull' does not exist (or could not be read)");

tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php

@@ -188,6 +188,9 @@ abstract class ItopCustomDatamodelTestCase extends ItopDataTestCase
 			CMDBSource::DropTable("priv_module_install");
 			CMDBSource::Query("CREATE TABLE $sNewDB.priv_module_install SELECT * FROM $sPreviousDB.priv_module_install");
 
+			CMDBSource::DropTable("priv_extension_install");
+			CMDBSource::Query("CREATE TABLE $sNewDB.priv_extension_install SELECT * FROM $sPreviousDB.priv_extension_install");
+
 			$this->debug("Custom environment '$sTestEnv' is ready!");
 		} else {
 			$this->debug("Custom environment '$sTestEnv' READY BUILT:");