From 18b7ee4d30dd17148fb8cb7ab913df842c6ee299 Mon Sep 17 00:00:00 2001
From: odain-cbd <56586767+odain-cbd@users.noreply.github.com>
Date: Fri, 21 Aug 2026 15:58:38 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B09965=20-=20Extensions=20management=20and?=
 =?UTF-8?q?=20Designer=20don't=20have=20the=20same=20view=20on=20extension?=
 =?UTF-8?q?=20(#1020)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* N°9965 - GetChoicesFromDatabase no more static to mock it

* N°9965 - remove empty line
---
 setup/extensionsmap.class.inc.php               | 4 ++--
 setup/wizardsteps/WizStepLandingBeforeAudit.php | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup/extensionsmap.class.inc.php b/setup/extensionsmap.class.inc.php
index 7779bc6c09..3cef2e89a7 100644
--- a/setup/extensionsmap.class.inc.php
+++ b/setup/extensionsmap.class.inc.php
@@ -710,7 +710,7 @@ class iTopExtensionsMap
 		}
 	}
 
-	public static function GetChoicesFromDatabase(Config $oConfig): array|false
+	public function GetChoicesFromDatabase(Config $oConfig): array|false
 	{
 		try {
 			if (CMDBSource::DBName() === null) {
@@ -739,7 +739,7 @@ class iTopExtensionsMap
 	 */
 	public function GetSelectedExtensions(Config $oConfig, array $aAddedExtensions, array $aRemovedExtensions): array
 	{
-		$aDbChoices = self::GetChoicesFromDatabase($oConfig);
+		$aDbChoices = $this->GetChoicesFromDatabase($oConfig);
 		foreach ($aDbChoices as $i => $sChoice) {
 			if (in_array($sChoice, $aRemovedExtensions)) {
 				unset($aDbChoices[$i]);
diff --git a/setup/wizardsteps/WizStepLandingBeforeAudit.php b/setup/wizardsteps/WizStepLandingBeforeAudit.php
index c77db51359..11eb5d0af4 100644
--- a/setup/wizardsteps/WizStepLandingBeforeAudit.php
+++ b/setup/wizardsteps/WizStepLandingBeforeAudit.php
@@ -74,7 +74,6 @@ class WizStepLandingBeforeAudit extends WizStepModulesChoice
 
 			// Component selection in previous screens
 			if ($this->oWizard->GetParameter('selected_components', '[]') === '[]') {
-
 				$aSelectedComponents = $this->GetSelectedComponents($this->aSteps, $this->oWizard->GetParameter('selected_extensions', '[]'));
 				$this->oWizard->SetParameter('selected_components', json_encode($aSelectedComponents));
 			} else {