Code style fix...

Author: Timmy38

setup/extensionsmap.class.inc.php

@@ -404,8 +404,7 @@ protected function CheckDependencies($sFromEnvironment)
 
 		try {
 			$aAllModules = ModuleDiscovery::GetAvailableModules($aSearchDirs, true);
-		}
-		catch (MissingDependencyException $e) {
+		} 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) {
@@ -507,7 +506,7 @@ public function LoadChoicesFromDatabase(Config $oConfig)
 
 		$aInstalledExtensions = $this->GetInstalledExtensionsFromDatabase($oConfig);
 
-		foreach($aInstalledExtensions as $aDBInfo) {
+		foreach ($aInstalledExtensions as $aDBInfo) {
 			$this->MarkAsChosen($aDBInfo['code']);
 			$this->SetInstalledVersion($aDBInfo['code'], $aDBInfo['version']);
 		}
@@ -528,7 +527,6 @@ public function GetInstalledExtensionsFromDatabase(Config $oConfig): array|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/moduleinstallation.class.inc.php

@@ -89,7 +89,7 @@ public static function Init()
 		MetaModel::Init_AddAttribute(new AttributeString("source", ["allowed_values" => null, "sql" => "source", "default_value" => null, "is_null_allowed" => false, "depends_on" => []]));
 		MetaModel::Init_AddAttribute(new AttributeEnum("uninstallable", ["allowed_values" => new ValueSetEnum('yes,no,maybe'), "sql" => "uninstallable", "default_value" => 'yes', "is_null_allowed" => false, "depends_on" => []]));
 		MetaModel::Init_AddAttribute(new AttributeDateTime("installed", ["allowed_values" => null, "sql" => "installed", "default_value" => 'NOW()', "is_null_allowed" => false, "depends_on" => []]));
-		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("description", ["allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => true, "depends_on" => []]));
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', ['code', 'label', 'version', 'installed', 'source']); // Attributes to be displayed for the complete details

setup/wizardsteps.class.inc.php

@@ -1310,7 +1310,7 @@ public function JSCanMoveForward()
  */
 class WizStepModulesChoice extends WizardStep
 {
-	static protected string $SEP = '_';
+	protected static string $SEP = '_';
 	protected bool $bUpgrade = false;
 	protected bool $bCanMoveForward = true;
 	protected ?Config $oConfig = null;
@@ -1890,10 +1890,10 @@ protected function GetStepInfo($idx = null)
 			}
 			//Listing previously installed extension missing from disk
 			if (!is_null($this->oConfig) && ($aPreviouslyInstalled = $this->oExtensionsMap->GetInstalledExtensionsFromDatabase($this->oConfig))) {
-				foreach($aPreviouslyInstalled as $aExtension) {
+				foreach ($aPreviouslyInstalled as $aExtension) {
 					if (!$this->oExtensionsMap->Get($aExtension['code'])) {
 						$bUninstallable = $aExtension['uninstallable'] === 'yes';
-						$aStepDefinition['options'][] = array(
+						$aStepDefinition['options'][] = [
 							'extension_code' => $aExtension['code'],
 							'title' => $aExtension['label'],
 							'description' => $aExtension['description'] ?? '',
@@ -1904,7 +1904,7 @@ protected function GetStepInfo($idx = null)
 							'source_label' => $this->GetExtensionSourceLabel($aExtension['source']),
 							'uninstallable' => $bUninstallable,
 							'missing' => true,
-						);
+						];
 					} else {
 						$this->oExtensionsMap->Get($aExtension['code'])->bInstalled = true;
 					}
@@ -1986,7 +1986,8 @@ protected function DisplayOptions($oPage, $aStepInfo, $aSelectedComponents, $aDe
 			$oITopExtension = $this->oExtensionsMap->Get($aChoice['extension_code']);
 			$bCanBeUninstalled = isset($aChoice['uninstallable']) ? $aChoice['uninstallable'] : $oITopExtension->CanBeUninstalled();
 			$bSelected = isset($aSelectedComponents[$sChoiceId]) && ($aSelectedComponents[$sChoiceId] == $sChoiceId);
-			$bMandatory = (isset($aChoice['mandatory']) && $aChoice['mandatory']) || $this->bUpgrade && $bIsDefault && !$bCanBeUninstalled && !$bDisableUninstallCheck;;
+			$bMandatory = (isset($aChoice['mandatory']) && $aChoice['mandatory']) || $this->bUpgrade && $bIsDefault && !$bCanBeUninstalled && !$bDisableUninstallCheck;
+			;
 			$bMissingFromDisk = isset($aChoice['missing']) && $aChoice['missing'] === true;
 			$bInstalled = $bMissingFromDisk || $oITopExtension->bInstalled;
 			$bDisabled = $bMandatory || $bAllDisabled || $bMissingFromDisk;
@@ -2083,7 +2084,6 @@ protected function DisplayChoice($oPage, $aChoice, $aSelectedComponents, $aDefau
 		$sSourceLabel = $aChoice['source_label'] ?? '';
 		$sId = utils::EscapeHtml($aChoice['extension_code']);
 
-
 		$oPage->add('<label class="setup--wizard-choice--label" for="'.$sId.'">'.$sSourceLabel.'<b>'.utils::EscapeHtml($aChoice['title']).'</b>'.'&nbsp;'.$sTooltip.'</label> '.$sMoreInfo.'');
 		$sDescription = isset($aChoice['description']) ? utils::EscapeHtml($aChoice['description']) : '';
 		$oPage->add('<div class="setup--wizard-choice--description description">'.$sDescription.'<span id="sub_choices'.$sId.'">');
@@ -2110,7 +2110,6 @@ public function JSCanMoveForward()
 		return $this->bCanMoveForward ? 'return true;' : 'return false;';
 	}
 
-
 	public function GetNextButtonLabel()
 	{
 		return $this->bCanMoveForward ? 'Next' : 'Non-uninstallatble extension missing';