N°9144 Fix CodeStyle

setup/StepSequencer.php

@@ -1,6 +1,7 @@
 <?php
 
-abstract class StepSequencer {
+abstract class StepSequencer
+{
 	public const OK = 1;
 	public const ERROR = 2;
 	public const WARNING = 3;
@@ -73,4 +74,4 @@ abstract class StepSequencer {
 	}
 
 	abstract public function ExecuteStep($sStep = '', $sComment = null);
-}
+}

setup/applicationinstaller.class.inc.php

@@ -46,7 +46,6 @@ require_once APPROOT.'setup/feature_removal/DryRemovalRuntimeEnvironment.php';
 
 class ApplicationInstallSequencer extends StepSequencer
 {
-
 	/** @var \Parameters */
 	protected $oParams;
 	protected static $bMetaModelStarted = false;
@@ -91,8 +90,6 @@ class ApplicationInstallSequencer extends StepSequencer
 		return 'env-'.$sTargetEnv;
 	}
 
-
-
 	protected function GetConfig()
 	{
 		$sTargetEnvironment = $this->GetTargetEnv();
@@ -218,11 +215,9 @@ class ApplicationInstallSequencer extends StepSequencer
 						$bUseSymbolicLinks
 					);
 
-
 					$sNextStep = 'db-schema';
 					$sNextStepLabel = 'Updating database schema';
 
-
 					$aResult = [
 						'status' => self::OK,
 						'message' => '',
@@ -477,7 +472,6 @@ class ApplicationInstallSequencer extends StepSequencer
 
 		$bIsAlreadyInMaintenanceMode = SetupUtils::IsInMaintenanceMode();
 
-
 		if (($sEnvironment == 'production') && !$bIsAlreadyInMaintenanceMode) {
 			$sConfigFilePath = utils::GetConfigFilePath($sEnvironment);
 			if (is_file($sConfigFilePath)) {
@@ -486,7 +480,7 @@ class ApplicationInstallSequencer extends StepSequencer
 				SetupUtils::EnterMaintenanceMode($oConfig);
 			}
 		}
-		try{
+		try {
 			if (!is_dir($sTargetPath)) {
 				if (!mkdir($sTargetPath)) {
 					throw new Exception("Failed to create directory '$sTargetPath', please check the rights of the web server");
@@ -546,8 +540,7 @@ class ApplicationInstallSequencer extends StepSequencer
 			$sCacheDir = APPROOT.'/data/cache-'.$sEnvironment.'/';
 			SetupUtils::builddir($sCacheDir);
 			SetupUtils::tidydir($sCacheDir);
-		}
-		catch(Exception $e){
+		} catch (Exception $e) {
 			if (($sEnvironment == 'production') && !$bIsAlreadyInMaintenanceMode) {
 				SetupUtils::ExitMaintenanceMode();
 			}
@@ -606,9 +599,6 @@ class ApplicationInstallSequencer extends StepSequencer
 		return $aModelInfo;
 	}
 
-
-
-
 	protected function IsSetupDataAuditEnabled($sSkipDataAudit, array $aParamValues): bool
 	{
 		if ($sSkipDataAudit === "checked") {
@@ -1004,7 +994,6 @@ class DataAuditSequencer extends ApplicationInstallSequencer
 {
 	public const DATA_AUDIT_FAILED = 100;
 
-
 	protected function GetTempEnv()
 	{
 		$sTargetEnv = $this->GetTargetEnv();
@@ -1062,7 +1051,6 @@ class DataAuditSequencer extends ApplicationInstallSequencer
 
 					break;
 
-
 				case 'compile':
 					$aSelectedModules = $this->oParams->Get('selected_modules');
 					$sSourceDir = $this->oParams->Get('source_dir', 'datamodels/latest');
@@ -1105,7 +1093,7 @@ class DataAuditSequencer extends ApplicationInstallSequencer
 						'percentage-completed' => 80,
 					];
 					break;
-				case 'cleanup' ;
+				case 'cleanup' :
 					$this->DoCleanup();
 					$aResult = [
 						'status' => self::OK,
@@ -1158,8 +1146,8 @@ class DataAuditSequencer extends ApplicationInstallSequencer
 		return $aResult;
 	}
 
-
-	protected function DoWriteConfig(){
+	protected function DoWriteConfig()
+	{
 		$sConfigFilePath = utils::GetConfigFilePath($this->GetTargetEnv());
 		if (is_file($sConfigFilePath)) {
 			$oConfig = new Config($sConfigFilePath);
@@ -1194,7 +1182,8 @@ class DataAuditSequencer extends ApplicationInstallSequencer
 		}
 	}
 
-	protected function DoCleanup(){
+	protected function DoCleanup()
+	{
 		$sDestination = APPROOT.$this->GetTargetDir();
 		SetupUtils::tidydir($sDestination);
 		SetupUtils::rmdir_safe($sDestination);

setup/wizardcontroller.class.inc.php

@@ -172,7 +172,7 @@ class WizardController
 		/** @var \WizardStep $oStep */
 		$oStep = new $sCurrentStepClass($this, $sCurrentState);
 		if ($oStep->ValidateParams()) {
-			if($oStep->CanComeBack()) {
+			if ($oStep->CanComeBack()) {
 				$this->PushStep(['class' => $sCurrentStepClass, 'state' => $sCurrentState]);
 			}
 			$aPossibleSteps = $oStep->GetPossibleSteps();
@@ -386,4 +386,3 @@ on the page's parameters
 		return $sOutput;
 	}
 }
-

setup/wizardsteps/AbstractWizStepInstall.php

@@ -1,6 +1,7 @@
 <?php
 
-abstract class AbstractWizStepInstall extends WizardStep {
+abstract class AbstractWizStepInstall extends WizardStep
+{
 	/**
 	 * Prepare the parameters to execute the installation asynchronously
 	 * @return array A big hash array that can be converted to XML or JSON with all the needed parameters
@@ -89,4 +90,4 @@ abstract class AbstractWizStepInstall extends WizardStep {
 		return $aInstallParams;
 	}
 
-}
+}

setup/wizardsteps/AbstractWizStepMiscParams.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *

setup/wizardsteps/WizStepAdminAccount.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *

setup/wizardsteps/WizStepDBParams.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *
@@ -22,7 +23,6 @@
  */
 use Combodo\iTop\Application\WebPage\WebPage;
 
-
 class WizStepDBParams extends WizardStep
 {
 	public function GetTitle()

setup/wizardsteps/WizStepDataAudit.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *
@@ -23,7 +24,7 @@ use Combodo\iTop\Application\WebPage\WebPage;
  */
 class WizStepDataAudit extends WizStepInstall
 {
-	const SequencerClass = DataAuditSequencer::class;
+	public const SequencerClass = DataAuditSequencer::class;
 
 	public function GetTitle()
 	{
@@ -88,8 +89,9 @@ JS
 		);
 	}
 
-	protected function AddProgressErrorScript($oPage, $aRes){
-		if(isset($aRes['error_code']) && $aRes['error_code'] === DataAuditSequencer::DATA_AUDIT_FAILED){
+	protected function AddProgressErrorScript($oPage, $aRes)
+	{
+		if (isset($aRes['error_code']) && $aRes['error_code'] === DataAuditSequencer::DATA_AUDIT_FAILED) {
 
 			$oPage->add_ready_script(
 				<<<EOF

setup/wizardsteps/WizStepDetectedInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *
@@ -18,7 +19,6 @@
  */
 use Combodo\iTop\Application\WebPage\WebPage;
 
-
 /**
  * Upgrade information
  */

setup/wizardsteps/WizStepDone.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *

setup/wizardsteps/WizStepInstall.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *
@@ -20,7 +21,7 @@ use Combodo\iTop\Application\WebPage\WebPage;
 
 class WizStepInstall extends AbstractWizStepInstall
 {
-	const SequencerClass = ApplicationInstallSequencer::class;
+	public const SequencerClass = ApplicationInstallSequencer::class;
 
 	public function GetTitle()
 	{
@@ -90,7 +91,6 @@ JS
 		);
 	}
 
-
 	/**
 	 * @throws \Exception
 	 */
@@ -142,7 +142,8 @@ EOF
 		}
 	}
 
-	protected function AddProgressErrorScript($oPage, $aRes){
+	protected function AddProgressErrorScript($oPage, $aRes)
+	{
 
 	}
 

setup/wizardsteps/WizStepInstallMiscParams.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *

setup/wizardsteps/WizStepInstallOrUpgrade.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *

setup/wizardsteps/WizStepLicense.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *

setup/wizardsteps/WizStepLicense2.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *

setup/wizardsteps/WizStepModulesChoice.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *
@@ -157,8 +158,7 @@ class WizStepModulesChoice extends WizardStep
 				$sMode = $this->oWizard->GetParameter('mode', 'install');
 				if ($sMode == 'install') {
 					return ['class' => 'WizStepSummary', 'state' => ''];
-				}
-				else {
+				} else {
 					return ['class' => 'WizStepDataAudit', 'state' => ''];
 				}
 

setup/wizardsteps/WizStepSummary.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *
@@ -23,8 +24,6 @@ use Combodo\iTop\Application\WebPage\WebPage;
  */
 class WizStepSummary extends AbstractWizStepInstall
 {
-
-
 	public function GetTitle()
 	{
 		$sMode = $this->oWizard->GetParameter('mode', 'install');
@@ -203,7 +202,6 @@ class WizStepSummary extends AbstractWizStepInstall
 			}
 		}
 
-
 		$aBackupChecks = SetupUtils::CheckBackupPrerequisites($sDBBackupPath, $sMySQLBinDir);
 		$bCanBackup = true;
 		$sMySQLDumpMessage = '';
@@ -244,8 +242,6 @@ JS
 		);
 	}
 
-
-
 	/**
 	 * Tells whether the "Next" button should be enabled interactively
 	 * @return string A piece of javascript code returning either true or false

setup/wizardsteps/WizStepUpgradeMiscParams.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *

setup/wizardsteps/WizStepWelcome.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *

setup/wizardsteps/WizardStep.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2013-2026 Combodo SAS
  *