N°8760 - Audit uninstall of extensions that declare final classes

N°8760 - be able to list modules based on extension choices
refactoring: move some classes in a moduleinstallation folder (coming
namespace)

N°8760 - module dependency check applied before audit

N°8760 - make dependency check work during audit

N°8760 - fix ci

N°8760 - fix ci

N°8760 - add GetCreatedIn to get module name based on DBObject class - everything stored in MetaModel during compilation and autoload

N°8760 - be able to describe from which module a datamodel class comes via MetaModel created_in field

N°8760 - rename GetCreatedIn <- GetModuleName + compute module name live instead having complex stuff in MetaModel/compilation

temp review 1

review: renaming InstallationChoicesToModuleConverter

review: renaming InstallationChoicesToModuleConverter

review: ModuleDiscovery:GetModulesOrderedByDependencies replacing deprecated GetAvailableModules method

ci: fix typo

cleanup

review: rework InstallationChoicesToModuleConverter

N°8760 - review tests

setup/compiler.class.inc.php

@@ -477,7 +477,7 @@ class MFCompiler
 					$sClass = $oClass->getAttribute("id");
 					$aAllClasses[] = $sClass;
 					try {
-						$sCompiledCode .= $this->CompileClass($oClass, $sModuleName, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir);
+						$sCompiledCode .= $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir);
 					} catch (DOMFormatException $e) {
 						$sMessage = "Failed to process class '$sClass', ";
 						if (!empty($sModuleRootDir)) {
@@ -1189,7 +1189,6 @@ EOF
 
 	/**
 	 * @param \MFElement $oClass
-	 * @param string $sModuleName
 	 * @param string $sTempTargetDir
 	 * @param string $sFinalTargetDir
 	 * @param string $sModuleRelativeDir
@@ -1197,7 +1196,7 @@ EOF
 	 * @return string
 	 * @throws \DOMFormatException
 	 */
-	protected function CompileClass($oClass, $sModuleName, $sTempTargetDir, $sFinalTargetDir, $sModuleRelativeDir)
+	protected function CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sModuleRelativeDir)
 	{
 		$sClass = $oClass->getAttribute('id');
 		$oProperties = $oClass->GetUniqueElement('properties');
@@ -1210,7 +1209,6 @@ EOF
 		$aClassParams = [];
 		$aClassParams['category'] = $this->GetPropString($oProperties, 'category', '');
 		$aClassParams['key_type'] = "'autoincrement'";
-		$aClassParams['created_in'] = "'$sModuleName'";
 		if ((bool)$this->GetPropNumber($oProperties, 'is_link', 0)) {
 			$aClassParams['is_link'] = 'true';
 		}

setup/extensionsmap.class.inc.php

@@ -194,7 +194,7 @@ class iTopExtensionsMap
 			}
 		}
 
-		\ModuleDiscovery::DeclareRemovedExtensions($aRemovedExtension);
+		ModuleDiscovery::DeclareRemovedExtensions($aRemovedExtension);
 	}
 
 	/**
@@ -329,7 +329,7 @@ class iTopExtensionsMap
 		$aSearchDirs = array_merge($aSearchDirs, $this->aScannedDirs);
 
 		try {
-			ModuleDiscovery::GetAvailableModules($aSearchDirs, true);
+			ModuleDiscovery::GetModulesOrderedByDependencies($aSearchDirs, true);
 		} catch (MissingDependencyException $e) {
 			// Some modules have missing dependencies
 			// Let's check what is the impact at the "extensions" level
@@ -566,6 +566,27 @@ 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 InstallationChoicesToModuleConverter;
 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::GetModulesOrderedByDependencies($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 = InstallationChoicesToModuleConverter::GetInstance()->GetModules($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/modelfactory.class.inc.php

@@ -1801,7 +1801,7 @@ EOF
 	 */
 	public function FindModules()
 	{
-		$aAvailableModules = ModuleDiscovery::GetAvailableModules($this->aRootDirs);
+		$aAvailableModules = ModuleDiscovery::GetModulesOrderedByDependencies($this->aRootDirs);
 		$aResult = [];
 		foreach ($aAvailableModules as $sId => $aModule) {
 			$oModule = new MFModule($sId, $aModule['root_dir'], $aModule['label'], isset($aModule['auto_select']));

setup/moduledependency/dependencyexpression.class.inc.php

@@ -61,7 +61,7 @@ class DependencyExpression
 		}
 	}
 
-	private static function GetPhpExpressionEvaluator(): PhpExpressionEvaluator
+	public static function GetPhpExpressionEvaluator(): PhpExpressionEvaluator
 	{
 		if (!isset(self::$oPhpExpressionEvaluator)) {
 			self::$oPhpExpressionEvaluator = new PhpExpressionEvaluator([], RunTimeEnvironment::STATIC_CALL_AUTOSELECT_WHITELIST);

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'];
@@ -196,21 +196,6 @@ class ModuleDiscovery
 		}
 	}
 
-	/**
-	 * Get the list of "discovered" modules, ordered based on their (inter) dependencies
-	 *
-	 * @param bool $bAbortOnMissingDependency ...
-	 * @param array $aModulesToLoad List of modules to search for, defaults to all if omitted
-	 *
-	 * @return array
-	 * @throws \MissingDependencyException
-	 */
-	protected static function GetModules($bAbortOnMissingDependency = false, $aModulesToLoad = null)
-	{
-		// Order the modules to take into account their inter-dependencies
-		return self::OrderModulesByDependencies(self::$m_aModules, $bAbortOnMissingDependency, $aModulesToLoad);
-	}
-
 	/**
 	 * Arrange an list of modules, based on their (inter) dependencies
 	 * @param array $aModules The list of modules to process: 'id' => $aModuleInfo
@@ -238,6 +223,7 @@ class ModuleDiscovery
 				}
 			}
 		}
+
 		return ModuleDependencySort::GetInstance()->GetModulesOrderedForInstallation($aFilteredModules, $bAbortOnMissingDependency);
 	}
 
@@ -245,7 +231,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();
@@ -253,79 +239,7 @@ class ModuleDiscovery
 		self::$m_aRemovedExtensions = $aRemovedExtension;
 	}
 
-	/**
-	 * @param array<\iTopExtension> $aExtensions
-	 * @param string $sModuleName
-	 * @param string $sModuleVersion
-	 * @param array $aModuleInfo
-	 *
-	 * @return bool
-	 */
-	private static function IsModuleInExtensionList(array $aExtensions, string $sModuleName, string $sModuleVersion, array $aModuleInfo): bool
-	{
-		if (count($aExtensions) === 0) {
-			return false;
-		}
-		$aNonMatchingPaths = [];
-		$sModuleFilePath = $aModuleInfo[ModuleFileReader::MODULE_FILE_PATH];
-
-		/** @var \iTopExtension $oExtension */
-		foreach ($aExtensions as $oExtension) {
-			$sCurrentVersion = $oExtension->aModuleVersion[$sModuleName] ?? null;
-			if (is_null($sCurrentVersion)) {
-				continue;
-			}
-
-			if ($sModuleVersion !== $sCurrentVersion) {
-				continue;
-			}
-
-			$aCurrentModuleInfo = $oExtension->aModuleInfo[$sModuleName] ?? null;
-			if (is_null($aCurrentModuleInfo)) {
-				SetupLog::Warning("Missing $sModuleName in ".$oExtension->sLabel.". it should not happen");
-				continue;
-			}
-
-			// use case: same module coming from 2 different extensions
-			// we remove only the one coming from removed extensions
-			$sCurrentModuleFilePath = $aCurrentModuleInfo[ModuleFileReader::MODULE_FILE_PATH];
-			if (realpath($sModuleFilePath) !== realpath($sCurrentModuleFilePath)) {
-				$aNonMatchingPaths[] = $sCurrentModuleFilePath;
-				continue;
-			}
-
-			SetupLog::Info("Module considered as removed", null, ['extension_code' => $oExtension->sCode, 'module_name' => $sModuleName, 'module_version' => $sModuleVersion, ModuleFileReader::MODULE_FILE_PATH => $sCurrentModuleFilePath]);
-			return true;
-		}
-
-		if (count($aNonMatchingPaths) > 0) {
-			//add log for support
-			SetupLog::Debug("Module kept as it came from non removed extensions", null, ['module_name' => $sModuleName, 'module_version' => $sModuleVersion, ModuleFileReader::MODULE_FILE_PATH => $sModuleFilePath, 'non_matching_paths' => $aNonMatchingPaths]);
-		}
-		return false;
-	}
-
-	private static function GetPhpExpressionEvaluator(): PhpExpressionEvaluator
-	{
-		if (!isset(self::$oPhpExpressionEvaluator)) {
-			self::$oPhpExpressionEvaluator = new PhpExpressionEvaluator([], RunTimeEnvironment::STATIC_CALL_AUTOSELECT_WHITELIST);
-		}
-
-		return self::$oPhpExpressionEvaluator;
-	}
-
-	/**
-	 * Search (on the disk) for all defined iTop modules, load them and returns the list (as an array)
-	 * of the possible iTop modules to install
-	 *
-	 * @param $aSearchDirs array of directories to search (absolute paths)
-	 * @param bool $bAbortOnMissingDependency ...
-	 * @param array $aModulesToLoad List of modules to search for, defaults to all if omitted
-	 *
-	 * @return array A big array moduleID => ModuleData
-	 * @throws \Exception
-	 */
-	public static function GetAvailableModules($aSearchDirs, $bAbortOnMissingDependency = false, $aModulesToLoad = null)
+	private static function Init($aSearchDirs): void
 	{
 		if (self::$m_aSearchDirs != $aSearchDirs) {
 			self::ResetCache();
@@ -344,13 +258,60 @@ class ModuleDiscovery
 				clearstatcache();
 				self::ListModuleFiles(basename($sSearchDir), dirname($sSearchDir));
 			}
-			return self::GetModules($bAbortOnMissingDependency, $aModulesToLoad);
-		} else {
-			// Reuse the previous results
-			return self::GetModules($bAbortOnMissingDependency, $aModulesToLoad);
 		}
 	}
 
+	/**
+	 * Return all modules found on disk ordered by dependencies. Skipping modules coming from extensions declared as removed (@see ModuleDiscovery::DeclareRemovedExtensions)
+	 * @param $aSearchDirs array of directories to search (absolute paths)
+	 * @param bool $bAbortOnMissingDependency ...
+	 * @param array $aModulesToLoad List of modules to search for, defaults to all if omitted
+	 *
+	 * @return array A big array moduleID => ModuleData
+	 * @throws \Exception
+	 */
+	public static function GetModulesOrderedByDependencies($aSearchDirs, $bAbortOnMissingDependency = false, $aModulesToLoad = null)
+	{
+		self::Init($aSearchDirs);
+
+		return self::OrderModulesByDependencies(self::$m_aModules, $bAbortOnMissingDependency, $aModulesToLoad);
+	}
+
+	/**
+	 * @deprecated use \ModuleDiscovery::GetModulesOrderedByDependencies instead
+	 */
+	public static function GetAvailableModules($aSearchDirs, $bAbortOnMissingDependency = false, $aModulesToLoad = null)
+	{
+		return ModuleDiscovery::GetModulesOrderedByDependencies($aSearchDirs, $bAbortOnMissingDependency, $aModulesToLoad);
+	}
+
+	/**
+	 * Return all modules found on disk (without any dependency consideration). Skipping modules coming from extensions declared as removed (@see ModuleDiscovery::DeclareRemovedExtensions)
+	 *
+	 * @param $aSearchDirs array of directories to search (absolute paths)
+	 *
+	 * @return array A big array moduleID => ModuleData
+	 * @throws \Exception
+	 */
+	public static function GetAllModules($aSearchDirs)
+	{
+		self::Init($aSearchDirs);
+
+		$aNonRemovedModules = [];
+		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;
+			}
+
+			$aNonRemovedModules[$sModuleId] = $aModuleInfo;
+		}
+
+		return $aNonRemovedModules;
+	}
+
 	public static function ResetCache()
 	{
 		self::$m_aSearchDirs = null;
@@ -419,6 +380,59 @@ class ModuleDiscovery
 			throw new Exception("Data directory (".$sDirectory.") not found or not readable.");
 		}
 	}
+
+	/**
+	 * @param array<\iTopExtension> $aExtensions
+	 * @param string $sModuleName
+	 * @param string $sModuleVersion
+	 * @param array $aModuleInfo
+	 *
+	 * @return bool
+	 */
+	private static function IsModuleInExtensionList(array $aExtensions, string $sModuleName, string $sModuleVersion, array $aModuleInfo): bool
+	{
+		if (count($aExtensions) === 0) {
+			return false;
+		}
+		$aNonMatchingPaths = [];
+		$sModuleFilePath = $aModuleInfo[ModuleFileReader::MODULE_FILE_PATH];
+
+		/** @var \iTopExtension $oExtension */
+		foreach ($aExtensions as $oExtension) {
+			$sCurrentVersion = $oExtension->aModuleVersion[$sModuleName] ?? null;
+			if (is_null($sCurrentVersion)) {
+				continue;
+			}
+
+			if ($sModuleVersion !== $sCurrentVersion) {
+				continue;
+			}
+
+			$aCurrentModuleInfo = $oExtension->aModuleInfo[$sModuleName] ?? null;
+			if (is_null($aCurrentModuleInfo)) {
+				SetupLog::Warning("Missing $sModuleName in ".$oExtension->sLabel.". it should not happen");
+				continue;
+			}
+
+			// use case: same module coming from 2 different extensions
+			// we remove only the one coming from removed extensions
+			$sCurrentModuleFilePath = $aCurrentModuleInfo[ModuleFileReader::MODULE_FILE_PATH];
+			if (realpath($sModuleFilePath) !== realpath($sCurrentModuleFilePath)) {
+				$aNonMatchingPaths[] = $sCurrentModuleFilePath;
+				continue;
+			}
+
+			SetupLog::Info("Module considered as removed", null, ['extension_code' => $oExtension->sCode, 'module_name' => $sModuleName, 'module_version' => $sModuleVersion, ModuleFileReader::MODULE_FILE_PATH => $sCurrentModuleFilePath]);
+			return true;
+		}
+
+		if (count($aNonMatchingPaths) > 0) {
+			//add log for support
+			SetupLog::Debug("Module kept as it came from non removed extensions", null, ['module_name' => $sModuleName, 'module_version' => $sModuleVersion, ModuleFileReader::MODULE_FILE_PATH => $sModuleFilePath, 'non_matching_paths' => $aNonMatchingPaths]);
+		}
+		return false;
+	}
+
 } // End of class
 
 /** Alias for backward compatibility with old module files in which

setup/moduleinstallation/AnalyzeInstallation.php

@@ -73,7 +73,7 @@ class AnalyzeInstallation
 			//test only
 			$aAvailableModules = $this->aAvailableModules;
 		} else {
-			$aAvailableModules = ModuleDiscovery::GetAvailableModules($aDirs, $bAbortOnMissingDependency, $aModulesToLoad);
+			$aAvailableModules = ModuleDiscovery::GetModulesOrderedByDependencies($aDirs, $bAbortOnMissingDependency, $aModulesToLoad);
 		}
 
 		foreach ($aAvailableModules as $sModuleId => $aModuleInfo) {

setup/moduleinstallation/InstallationChoicesToModuleConverter.php

@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * @copyright   Copyright (C) 2010-2025 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+use Combodo\iTop\Setup\ModuleDependency\DependencyExpression;
+
+require_once __DIR__.'/ModuleInstallationException.php';
+require_once(APPROOT.'/setup/moduledependency/module.class.inc.php');
+
+class InstallationChoicesToModuleConverter
+{
+	private static ?InstallationChoicesToModuleConverter $oInstance;
+
+	protected function __construct()
+	{
+	}
+
+	final public static function GetInstance(): InstallationChoicesToModuleConverter
+	{
+		if (!isset(self::$oInstance)) {
+			self::$oInstance = new InstallationChoicesToModuleConverter();
+		}
+
+		return self::$oInstance;
+	}
+
+	final public static function SetInstance(?InstallationChoicesToModuleConverter $oInstance): void
+	{
+		self::$oInstance = $oInstance;
+	}
+
+	/**
+	 * @param array $aInstallationChoices
+	 * @param array $aSearchDirs
+	 *
+	 * @return array
+	 * @throws \ModuleInstallationException
+	 */
+	public function GetModules(array $aInstallationChoices, array $aSearchDirs, ?string $sInstallationFilePath = null): array
+	{
+		$aPackageModules = ModuleDiscovery::GetAllModules($aSearchDirs);
+
+		$bInstallationFileProvided = ! is_null($sInstallationFilePath) && is_file($sInstallationFilePath);
+
+		if ($bInstallationFileProvided) {
+			$oXMLParameters = new XMLParameters($sInstallationFilePath);
+			$aSteps = $oXMLParameters->Get('steps', []);
+			if (!is_array($aSteps)) {
+				return [];
+			}
+			$aInstalledModuleNames = $this->FindInstalledPackageModules($aPackageModules, $aInstallationChoices, $aSteps);
+		} else {
+			$aInstalledModuleNames = $this->FindInstalledPackageModules($aPackageModules, $aInstallationChoices);
+		}
+
+		$aInstalledModules = [];
+		foreach (array_keys($aPackageModules) as $sModuleId) {
+			list($sModuleName) = ModuleDiscovery::GetModuleName($sModuleId);
+			if (in_array($sModuleName, $aInstalledModuleNames)) {
+				$aInstalledModules[] = $sModuleId;
+			}
+		}
+
+		return $aInstalledModules;
+	}
+
+	private function FindInstalledPackageModules(array $aPackageModules, array $aInstallationChoices, array $aInstallationDescription = null): array
+	{
+		$aInstalledModules = [];
+
+		$this->ProcessDefaultModules($aPackageModules, $aInstalledModules);
+
+		if (is_null($aInstallationDescription)) {
+			//in legacy usecase: choices are flat modules list already
+			foreach ($aInstallationChoices as $sModuleName) {
+				$aInstalledModules[$sModuleName] = true;
+			}
+		} else {
+			$this->GetModuleNamesFromInstallationChoices($aInstallationChoices, $aInstallationDescription, $aInstalledModules);
+		}
+
+		$this->ProcessAutoSelectModules($aPackageModules, $aInstalledModules);
+
+		return array_keys($aInstalledModules);
+	}
+
+	private function IsDefaultModule(string $sModuleId, array $aModule): bool
+	{
+		if (($sModuleId === ROOT_MODULE)) {
+			return false;
+		}
+
+		if (isset($aModule['auto_select'])) {
+			return false;
+		}
+
+		if ($aModule['category'] === 'authentication') {
+			return true;
+		}
+
+		return !$aModule['visible'];
+	}
+
+	private function ProcessDefaultModules(array &$aPackageModules, array &$aInstalledModules): void
+	{
+		foreach ($aPackageModules as $sModuleId => $aModule) {
+			if ($this->IsDefaultModule($sModuleId, $aModule)) {
+				list($sModuleName) = ModuleDiscovery::GetModuleName($sModuleId);
+				$aInstalledModules[$sModuleName] = true;
+				unset($aPackageModules[$sModuleId]);
+			}
+		}
+	}
+
+	private function IsAutoSelectedModule(array $aInstalledModules, string $sModuleId, array $aModule): bool
+	{
+		if (($sModuleId === ROOT_MODULE)) {
+			return false;
+		}
+
+		if (!isset($aModule['auto_select'])) {
+			return false;
+		}
+
+		try {
+			SetupInfo::SetSelectedModules($aInstalledModules);
+			return DependencyExpression::GetPhpExpressionEvaluator()->ParseAndEvaluateBooleanExpression($aModule['auto_select']);
+		} catch (Exception $e) {
+			IssueLog::Error('Error evaluating module auto-select', null, [
+				'module' => $sModuleId,
+				'error' => $e->getMessage(),
+				'evaluated code' => $aModule['auto_select'],
+				'stacktrace' => $e->getTraceAsString(),
+			]);
+		}
+
+		return false;
+	}
+
+	private function ProcessAutoSelectModules(array $aPackageModules, array &$aInstalledModules): void
+	{
+		foreach ($aPackageModules as $sModuleId => $aModule) {
+			if ($this->IsAutoSelectedModule($aInstalledModules, $sModuleId, $aModule)) {
+				list($sModuleName) = ModuleDiscovery::GetModuleName($sModuleId);
+				$aInstalledModules[$sModuleName] = true;
+			}
+		}
+	}
+
+	private function GetModuleNamesFromInstallationChoices(array $aInstallationChoices, array $aInstallationDescription, array &$aModuleNames): void
+	{
+		foreach ($aInstallationDescription as $aStepInfo) {
+			$aOptions = $aStepInfo['options'] ?? null;
+			if (is_array($aOptions)) {
+				foreach ($aOptions as $aChoiceInfo) {
+					$this->ProcessSelectedChoice($aInstallationChoices, $aChoiceInfo, $aModuleNames);
+				}
+			}
+			$aOptions = $aStepInfo['alternatives'] ?? null;
+			if (is_array($aOptions)) {
+				foreach ($aOptions as $aChoiceInfo) {
+					$this->ProcessSelectedChoice($aInstallationChoices, $aChoiceInfo, $aModuleNames);
+				}
+			}
+		}
+	}
+
+	private function ProcessSelectedChoice(array $aInstallationChoices, array $aChoiceInfo, array &$aInstalledModules)
+	{
+		if (!is_array($aChoiceInfo)) {
+			return;
+		}
+
+		$sMandatory = $aChoiceInfo['mandatory'] ?? 'false';
+
+		$aCurrentModules = $aChoiceInfo['modules'] ?? [];
+		$sExtensionCode = $aChoiceInfo['extension_code'];
+
+		$bSelected = ($sMandatory === 'true') || in_array($sExtensionCode, $aInstallationChoices);
+
+		if (!$bSelected) {
+			return;
+		}
+
+		foreach ($aCurrentModules as $sModuleId) {
+			$aInstalledModules[$sModuleId] = true;
+		}
+
+		$aAlternatives = $aChoiceInfo['alternatives'] ?? null;
+		if (is_array($aAlternatives)) {
+			foreach ($aAlternatives as $aSubChoiceInfo) {
+				$this->ProcessSelectedChoice($aInstallationChoices, $aSubChoiceInfo, $aInstalledModules);
+			}
+		}
+
+		$aSubOptionsChoiceInfo = $aChoiceInfo['sub_options'] ?? null;
+		if (is_array($aSubOptionsChoiceInfo)) {
+			$aSubOptions = $aSubOptionsChoiceInfo['options'] ?? null;
+			if (is_array($aSubOptions)) {
+				foreach ($aSubOptions as $aSubChoiceInfo) {
+					$this->ProcessSelectedChoice($aInstallationChoices, $aSubChoiceInfo, $aInstalledModules);
+				}
+			}
+			$aSubAlternatives = $aSubOptionsChoiceInfo['alternatives'] ?? null;
+			if (is_array($aSubAlternatives)) {
+				foreach ($aSubAlternatives as $aSubChoiceInfo) {
+					$this->ProcessSelectedChoice($aInstallationChoices, $aSubChoiceInfo, $aInstalledModules);
+				}
+			}
+		}
+	}
+}

setup/moduleinstallation/ModuleInstallationException.php

@@ -0,0 +1,5 @@
+<?php
+
+class ModuleInstallationException extends Exception
+{
+}

setup/runtimeenv.class.inc.php

@@ -32,7 +32,8 @@ require_once APPROOT."setup/modulediscovery.class.inc.php";
 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/AnalyzeInstallation.php';
+require_once APPROOT.'setup/moduleinstallation/AnalyzeInstallation.php';
+require_once APPROOT . '/setup/moduleinstallation/InstallationChoicesToModuleConverter.php';
 
 define('MODULE_ACTION_OPTIONAL', 1);
 define('MODULE_ACTION_MANDATORY', 2);
@@ -129,7 +130,7 @@ class RunTimeEnvironment
 	 */
 	public function InitDataModel($oConfig, $bModelOnly = true, $bUseCache = false): void
 	{
-		require_once APPROOT.'/setup/moduleinstallation.class.inc.php';
+		require_once APPROOT.'/setup/moduleinstallation/moduleinstallation.class.inc.php';
 
 		$sConfigFile = $oConfig->GetLoadedFile();
 		if (strlen($sConfigFile) > 0) {
@@ -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)");

setup/setuputils.class.inc.php

@@ -509,7 +509,7 @@ class SetupUtils
 		}
 		require_once(APPROOT.'setup/modulediscovery.class.inc.php');
 		try {
-			ModuleDiscovery::GetAvailableModules($aDirsToScan, true, $aSelectedModules);
+			ModuleDiscovery::GetModulesOrderedByDependencies($aDirsToScan, true, $aSelectedModules);
 		} catch (Exception $e) {
 			$aResult[] = new CheckResult(CheckResult::ERROR, $e->getMessage());
 		}

setup/unattended-install/InstallationFileService.php

@@ -259,7 +259,7 @@ class InstallationFileService
 	{
 		$sProductionModuleDir = APPROOT.'data/'.$this->sTargetEnvironment.'-modules/';
 
-		$aAvailableModules = $this->GetProductionEnv()->AnalyzeInstallation(MetaModel::GetConfig(), $this->GetExtraDirs(), false, null);
+		$aAvailableModules = $this->GetProductionEnv()->AnalyzeInstallation(MetaModel::GetConfig(), $this->GetExtraDirs());
 
 		$this->aAutoSelectModules = [];
 		foreach ($aAvailableModules as $sModuleId => $aModule) {