N°8806 - fix tests

setup/feature_removal/DryRemovalRuntimeEnvironment.php

@@ -2,15 +2,11 @@
 
 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
 {
@@ -61,27 +57,6 @@ 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(): void
 	{
 		$sEnv = $this->sBuildEnv;

setup/modelfactory.class.inc.php

@@ -1170,6 +1170,7 @@ class ModelFactory
 					]);
 			}
 		} catch (Exception $e) {
+			SetupLog::Exception(__METHOD__, $e);
 			$aLoadedModuleNames = [];
 			foreach (self::$aLoadedModules as $oLoadedModule) {
 				$aLoadedModuleNames[] = $oLoadedModule->GetName().':'.$oLoadedModule->GetVersion();

setup/runtimeenv.class.inc.php

@@ -24,9 +24,9 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
 use Combodo\iTop\Setup\FeatureRemoval\SetupAudit;
+use Combodo\iTop\Setup\ModuleDependency\Module;
 use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReader;
 use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReaderException;
 
@@ -468,7 +468,9 @@ class RunTimeEnvironment
 		// Determine the installed modules and extensions
 		//
 		$oSourceConfig = new Config(APPCONF.$sSourceEnv.'/'.ITOP_CONFIG_FILE);
-		$aAvailableModules = $this->AnalyzeInstallation($oSourceConfig, $aDirsToCompile);
+
+		$aModulesToLoad = $this->GetModulesToLoad($this->sFinalEnv, $aDirsToCompile);
+		$aAvailableModules = $this->AnalyzeInstallation($oSourceConfig, $aDirsToCompile, false, $aModulesToLoad);
 
 		// Actually read the modules available for the build environment,
 		// but get the selection from the source environment and finally
@@ -1594,4 +1596,28 @@ class RunTimeEnvironment
 
 		return substr_compare($sHaystack, $sNeedle, 0, strlen($sNeedle)) === 0;
 	}
+
+	protected function GetModulesToLoad(string $sSourceEnv, $aSearchDirs): ?array
+	{
+		$oSourceConfig = new Config(utils::GetConfigFilePath($sSourceEnv));
+		$aChoices = iTopExtensionsMap::GetChoicesFromDatabase($oSourceConfig);
+		if (false === $aChoices) {
+			return null;
+		}
+		$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;
+	}
 }