diff --git a/setup/feature_removal/SetupAudit.php b/setup/feature_removal/SetupAudit.php index 1252491b6..b3e362677 100644 --- a/setup/feature_removal/SetupAudit.php +++ b/setup/feature_removal/SetupAudit.php @@ -2,8 +2,6 @@ namespace Combodo\iTop\Setup\FeatureRemoval; -use MetaModel; -use utils; require_once __DIR__.'/AbstractSetupAudit.php'; require_once APPROOT.'setup/feature_removal/ModelReflectionSerializer.php'; @@ -35,17 +33,6 @@ class SetupAudit extends AbstractSetupAudit $this->bClassesInitialized = true; } - /*public function SetSelectedExtensions(Config $oConfig, array $aSelectedExtensions) - { - $oExtensionsMap = new \iTopExtensionsMap(); - $oExtensionsMap->LoadChoicesFromDatabase($oConfig); - - sort($aSelectedExtensions); - $this->aExtensionToRemove = $oExtensionsMap->GetMissingExtensions($aSelectedExtensions); - sort($this->aExtensionToRemove); - \SetupLog::Info(__METHOD__, null, ['aExtensionToRemove' => $this->aExtensionToRemove]); - }*/ - public function GetRemovedClasses(): array { $this->ComputeClasses(); diff --git a/setup/wizardcontroller.class.inc.php b/setup/wizardcontroller.class.inc.php index 75bebc316..2ebe01538 100644 --- a/setup/wizardcontroller.class.inc.php +++ b/setup/wizardcontroller.class.inc.php @@ -21,7 +21,6 @@ use Combodo\iTop\Application\WebPage\WebPage; require_once(APPROOT.'setup/setuputils.class.inc.php'); require_once(APPROOT.'setup/parameters.class.inc.php'); require_once(APPROOT.'setup/applicationinstaller.class.inc.php'); -require_once(APPROOT.'setup/parameters.class.inc.php'); require_once(APPROOT.'core/mutex.class.inc.php'); require_once(APPROOT.'setup/extensionsmap.class.inc.php'); diff --git a/setup/wizardsteps/WizStepDBParams.php b/setup/wizardsteps/WizStepDBParams.php index 3911ab353..2181cb023 100644 --- a/setup/wizardsteps/WizStepDBParams.php +++ b/setup/wizardsteps/WizStepDBParams.php @@ -32,7 +32,7 @@ class WizStepDBParams extends WizardStep public function GetPossibleSteps() { - return ['WizStepAdminAccount']; + return [WizStepAdminAccount::class]; } public function UpdateWizardStateAndGetNextStep($bMoveForward = true) @@ -48,7 +48,7 @@ class WizStepDBParams extends WizardStep $this->oWizard->SaveParameter('db_tls_enabled', false); $this->oWizard->SaveParameter('db_tls_ca', ''); - return ['class' => 'WizStepAdminAccount', 'state' => '']; + return ['class' => WizStepAdminAccount::class, 'state' => '']; } public function Display(WebPage $oPage) diff --git a/setup/wizardsteps/WizStepDataAudit.php b/setup/wizardsteps/WizStepDataAudit.php index b71b051f8..31b79c511 100644 --- a/setup/wizardsteps/WizStepDataAudit.php +++ b/setup/wizardsteps/WizStepDataAudit.php @@ -36,7 +36,7 @@ class WizStepDataAudit extends WizStepInstall public function GetPossibleSteps() { - return ['WizStepSummary']; + return [WizStepSummary::class]; } public function GetNextButtonLabel() @@ -56,7 +56,7 @@ class WizStepDataAudit extends WizStepInstall public function UpdateWizardStateAndGetNextStep($bMoveForward = true) { - return ['class' => 'WizStepSummary', 'state' => '']; + return ['class' => WizStepSummary::class, 'state' => '']; } public function CanComeBack() diff --git a/setup/wizardsteps/WizStepDetectedInfo.php b/setup/wizardsteps/WizStepDetectedInfo.php index 9885d65fb..6c4073b79 100644 --- a/setup/wizardsteps/WizStepDetectedInfo.php +++ b/setup/wizardsteps/WizStepDetectedInfo.php @@ -33,7 +33,7 @@ class WizStepDetectedInfo extends WizardStep public function GetPossibleSteps() { - return ['WizStepUpgradeMiscParams', 'WizStepLicense2']; + return [WizStepUpgradeMiscParams::class, WizStepLicense2::class]; } public function UpdateWizardStateAndGetNextStep($bMoveForward = true) @@ -61,9 +61,9 @@ class WizStepDetectedInfo extends WizardStep // Do nothing, maybe the user pressed the Back button } if ($bDisplayLicense) { - $aRet = ['class' => 'WizStepLicense2', 'state' => '']; + $aRet = ['class' => WizStepLicense2::class, 'state' => '']; } else { - $aRet = ['class' => 'WizStepUpgradeMiscParams', 'state' => '']; + $aRet = ['class' => WizStepUpgradeMiscParams::class, 'state' => '']; } return $aRet; } @@ -131,7 +131,7 @@ EOF // Reinstalling the same version let's skip the license agreement... $bDisplayLicense = false; } - $this->oWizard->SetParameter('license', $bDisplayLicense); // Remember for later + $this->oWizard->SetParameter('display_license', $bDisplayLicense); // Remember for later $sCompatibleDMDir = SetupUtils::GetLatestDataModelDir(); if ($sCompatibleDMDir === false) { diff --git a/setup/wizardsteps/WizStepInstall.php b/setup/wizardsteps/WizStepInstall.php index 1bb66f399..9b1ae3fdf 100644 --- a/setup/wizardsteps/WizStepInstall.php +++ b/setup/wizardsteps/WizStepInstall.php @@ -32,7 +32,7 @@ class WizStepInstall extends AbstractWizStepInstall public function GetPossibleSteps() { - return ['WizStepDone']; + return [WizStepDone::class]; } /** @@ -55,7 +55,7 @@ class WizStepInstall extends AbstractWizStepInstall public function UpdateWizardStateAndGetNextStep($bMoveForward = true) { - return ['class' => 'WizStepDone', 'state' => '']; + return ['class' => WizStepDone::class, 'state' => '']; } protected function AddProgressBar(WebPage $oPage) diff --git a/setup/wizardsteps/WizStepInstallMiscParams.php b/setup/wizardsteps/WizStepInstallMiscParams.php index 79d038e69..acb7e6211 100644 --- a/setup/wizardsteps/WizStepInstallMiscParams.php +++ b/setup/wizardsteps/WizStepInstallMiscParams.php @@ -32,7 +32,7 @@ class WizStepInstallMiscParams extends AbstractWizStepMiscParams public function GetPossibleSteps() { - return ['WizStepModulesChoice']; + return [WizStepModulesChoice::class]; } public function UpdateWizardStateAndGetNextStep($bMoveForward = true) @@ -41,7 +41,7 @@ class WizStepInstallMiscParams extends AbstractWizStepMiscParams $this->oWizard->SaveParameter('application_url', ''); $this->oWizard->SaveParameter('graphviz_path', ''); $this->oWizard->SaveParameter('sample_data', 'yes'); - return ['class' => 'WizStepModulesChoice', 'state' => 'start_install']; + return ['class' => WizStepModulesChoice::class, 'state' => 'start_install']; } public function Display(WebPage $oPage) diff --git a/setup/wizardsteps/WizStepInstallOrUpgrade.php b/setup/wizardsteps/WizStepInstallOrUpgrade.php index 959764b86..a97ef3831 100644 --- a/setup/wizardsteps/WizStepInstallOrUpgrade.php +++ b/setup/wizardsteps/WizStepInstallOrUpgrade.php @@ -31,7 +31,7 @@ class WizStepInstallOrUpgrade extends WizardStep public function GetPossibleSteps() { - return ['WizStepDetectedInfo', 'WizStepLicense']; + return [WizStepDetectedInfo::class, WizStepLicense::class]; } public function UpdateWizardStateAndGetNextStep($bMoveForward = true) @@ -53,10 +53,10 @@ class WizStepInstallOrUpgrade extends WizardStep $sFullSourceDir = SetupUtils::GetLatestDataModelDir(); $this->oWizard->SetParameter('source_dir', $sFullSourceDir); $this->oWizard->SetParameter('datamodel_version', SetupUtils::GetDataModelVersion($sFullSourceDir)); - $sNextStep = 'WizStepLicense'; + $sNextStep = WizStepLicense::class; } else { $this->oWizard->SetParameter('install_mode', 'upgrade'); - $sNextStep = 'WizStepDetectedInfo'; + $sNextStep = WizStepDetectedInfo::class; } return ['class' => $sNextStep, 'state' => '']; diff --git a/setup/wizardsteps/WizStepLicense.php b/setup/wizardsteps/WizStepLicense.php index c4ad6b234..12368ad58 100644 --- a/setup/wizardsteps/WizStepLicense.php +++ b/setup/wizardsteps/WizStepLicense.php @@ -32,13 +32,13 @@ class WizStepLicense extends WizardStep public function GetPossibleSteps() { - return ['WizStepDBParams']; + return [WizStepDBParams::class]; } public function UpdateWizardStateAndGetNextStep($bMoveForward = true) { $this->oWizard->SaveParameter('accept_license', 'no'); - return ['class' => 'WizStepDBParams', 'state' => '']; + return ['class' => WizStepDBParams::class, 'state' => '']; } /** diff --git a/setup/wizardsteps/WizStepLicense2.php b/setup/wizardsteps/WizStepLicense2.php index 2115f81e4..12a8567c8 100644 --- a/setup/wizardsteps/WizStepLicense2.php +++ b/setup/wizardsteps/WizStepLicense2.php @@ -25,11 +25,11 @@ class WizStepLicense2 extends WizStepLicense { public function GetPossibleSteps() { - return ['WizStepUpgradeMiscParams']; + return [WizStepUpgradeMiscParams::class]; } public function UpdateWizardStateAndGetNextStep($bMoveForward = true) { - return ['class' => 'WizStepUpgradeMiscParams', 'state' => '']; + return ['class' => WizStepUpgradeMiscParams::class, 'state' => '']; } } diff --git a/setup/wizardsteps/WizStepModulesChoice.php b/setup/wizardsteps/WizStepModulesChoice.php index 07b3746cd..b80f41ffd 100644 --- a/setup/wizardsteps/WizStepModulesChoice.php +++ b/setup/wizardsteps/WizStepModulesChoice.php @@ -94,7 +94,7 @@ class WizStepModulesChoice extends WizardStep public function GetPossibleSteps() { - return ['WizStepModulesChoice', 'WizStepDataAudit', 'WizStepSummary']; + return [WizStepModulesChoice::class, WizStepDataAudit::class, WizStepSummary::class]; } public function GetAddedAndRemovedExtensions($aSelectedExtensions) @@ -144,7 +144,7 @@ class WizStepModulesChoice extends WizardStep throw new Exception('Internal error: invalid step "'.$index.'" for the choice of modules.'); } elseif ($bMoveForward) { if ($this->GetStepInfo(1 + $index) != null) { - return ['class' => 'WizStepModulesChoice', 'state' => (1 + $index)]; + return ['class' => WizStepModulesChoice::class, 'state' => (1 + $index)]; } else { // Exiting this step of the wizard, let's convert the selection into a list of modules $aModules = []; @@ -168,9 +168,9 @@ class WizStepModulesChoice extends WizardStep $this->oWizard->SetParameter('extensions_not_uninstallable', json_encode(array_keys($aExtensionsNotUninstallable))); $sMode = $this->oWizard->GetParameter('mode', 'install'); if ($sMode == 'install' || !$this->IsDataAuditEnabled()) { - return ['class' => 'WizStepSummary', 'state' => '']; + return ['class' => WizStepSummary::class, 'state' => '']; } else { - return ['class' => 'WizStepDataAudit', 'state' => '']; + return ['class' => WizStepDataAudit::class, 'state' => '']; } } @@ -711,7 +711,7 @@ EOF $sChoiceId = $sParentId.self::$SEP.$index; $sDataId = 'data-id="'.utils::EscapeHtml($aChoice['extension_code']).'"'; $sId = utils::EscapeHtml($aChoice['extension_code']); - $aFlags = static::ComputeChoiceFlags($aChoice, $sChoiceId, $aSelectedComponents, $bAllDisabled, $bDisableUninstallCheck, $this->bUpgrade); + $aFlags = $this->ComputeChoiceFlags($aChoice, $sChoiceId, $aSelectedComponents, $bAllDisabled, $bDisableUninstallCheck, $this->bUpgrade); $sTooltip = ''; $sUnremovable = ''; diff --git a/setup/wizardsteps/WizStepSummary.php b/setup/wizardsteps/WizStepSummary.php index afce2cdd6..70a2db69e 100644 --- a/setup/wizardsteps/WizStepSummary.php +++ b/setup/wizardsteps/WizStepSummary.php @@ -37,7 +37,7 @@ class WizStepSummary extends AbstractWizStepInstall public function GetPossibleSteps() { - return ['WizStepInstall']; + return [WizStepInstall::class]; } /** @@ -62,7 +62,7 @@ class WizStepSummary extends AbstractWizStepInstall { $this->oWizard->SaveParameter('db_backup', false); $this->oWizard->SaveParameter('db_backup_path', ''); - return ['class' => 'WizStepInstall', 'state' => '']; + return ['class' => WizStepInstall::class, 'state' => '']; } public function Display(WebPage $oPage) @@ -153,7 +153,7 @@ class WizStepSummary extends AbstractWizStepInstall $oPage->add(''); if ($sMode == 'install') { - $oPage->add('
Admininistrator Account