composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-07-16 19:56:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°9144 Replace strings with class names

Browse Source
This commit is contained in:
Timothee
2026-02-13 10:10:08 +01:00
parent b257d254d6
commit defca2d31e
15 changed files with 40 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup/feature_removal/SetupAudit.php
View File

@@ -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();

1
setup/wizardcontroller.class.inc.php
View File

@@ -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');

4
setup/wizardsteps/WizStepDBParams.php
View File

@@ -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)

4
setup/wizardsteps/WizStepDataAudit.php
View File

@@ -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()

8
setup/wizardsteps/WizStepDetectedInfo.php
View File

@@ -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) {

4
setup/wizardsteps/WizStepInstall.php
View File

@@ -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)

4
setup/wizardsteps/WizStepInstallMiscParams.php
View File

@@ -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)

6
setup/wizardsteps/WizStepInstallOrUpgrade.php
View File

@@ -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' => ''];

4
setup/wizardsteps/WizStepLicense.php
View File

@@ -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' => ''];
}
/**

4
setup/wizardsteps/WizStepLicense2.php
View File

@@ -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' => ''];
}
}

10
setup/wizardsteps/WizStepModulesChoice.php
View File

@@ -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 = '';

6
setup/wizardsteps/WizStepSummary.php
View File

@@ -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('</ul></div>');
if ($sMode == 'install') {
$oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Admininistrator Account</span><ul>');
$oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Administrator Account</span><ul>');
$oPage->add('<li>Login: '.$aInstallParams['admin_account']['user'].'</li>');
$oPage->add('<li>Password: '.$aInstallParams['admin_account']['pwd'].'</li>');
$oPage->add('<li>Language: '.$aInstallParams['admin_account']['language'].'</li>');

4
setup/wizardsteps/WizStepUpgradeMiscParams.php
View File

@@ -31,7 +31,7 @@ class WizStepUpgradeMiscParams extends AbstractWizStepMiscParams
public function GetPossibleSteps()
{
return ['WizStepModulesChoice'];
return [WizStepModulesChoice::class];
}
public function UpdateWizardStateAndGetNextStep($bMoveForward = true)
@@ -39,7 +39,7 @@ class WizStepUpgradeMiscParams extends AbstractWizStepMiscParams
$this->oWizard->SaveParameter('application_url', '');
$this->oWizard->SaveParameter('graphviz_path', '');
$this->oWizard->SaveParameter('force-uninstall', false);
return ['class' => 'WizStepModulesChoice', 'state' => 'start_upgrade'];
return ['class' => WizStepModulesChoice::class, 'state' => 'start_upgrade'];
}
public function Display(WebPage $oPage)

4
setup/wizardsteps/WizStepWelcome.php
View File

@@ -43,14 +43,14 @@ class WizStepWelcome extends WizardStep
public function GetPossibleSteps()
{
return ['WizStepInstallOrUpgrade'];
return [WizStepInstallOrUpgrade::class];
}
public function UpdateWizardStateAndGetNextStep($bMoveForward = true)
{
$sUID = SetupUtils::CreateSetupToken();
$this->oWizard->SetParameter('authent', $sUID);
return ['class' => 'WizStepInstallOrUpgrade', 'state' => ''];
return ['class' => WizStepInstallOrUpgrade::class, 'state' => ''];
}
public function Display(WebPage $oPage)

18
setup/wizardsteps/WizardStep.php
View File

@@ -221,7 +221,7 @@ class Step1 extends WizardStep
public function GetPossibleSteps()
{
return array('Step2', 'Step2bis');
return array(Step2::class, Step2bis::class);
}
public function ProcessParams($bMoveForward = true)
@@ -231,12 +231,12 @@ class Step1 extends WizardStep
if ($sInstallMode == 'install')
{
$this->oWizard->SetParameter('install_mode', 'install');
$sNextStep = 'Step2';
$sNextStep = Step2::class;
}
else
{
$this->oWizard->SetParameter('install_mode', 'upgrade');
$sNextStep = 'Step2bis';
$sNextStep = Step2bis::class;
}
return array('class' => $sNextStep, 'state' => '');
@@ -262,12 +262,12 @@ class Step2 extends WizardStep
public function GetPossibleSteps()
{
return array('Step3');
return array(Step3::class);
}
public function ProcessParams($bMoveForward = true)
{
return array('class' => 'Step3', 'state' => '');
return array('class' => Step3::class, 'state' => '');
}
public function Display(WebPage $oPage)
@@ -285,7 +285,7 @@ class Step2bis extends WizardStep
public function GetPossibleSteps()
{
return array('Step2ter');
return array(Step2ter::class);
}
public function ProcessParams($bMoveForward = true)
@@ -294,7 +294,7 @@ class Step2bis extends WizardStep
$this->oWizard->SetParameter('upgrade_info', $sUpgradeInfo);
$sAdditionalUpgradeInfo = utils::ReadParam('additional_upgrade_info');
$this->oWizard->SetParameter('additional_upgrade_info', $sAdditionalUpgradeInfo);
return array('class' => 'Step2ter', 'state' => '');
return array('class' => Step2ter::class, 'state' => '');
}
public function Display(WebPage $oPage)
@@ -334,12 +334,12 @@ class Step2ter extends WizardStep
public function GetPossibleSteps()
{
return array('Step3');
return array(Step3::class);
}
public function ProcessParams($bMoveForward = true)
{
return array('class' => 'Step3', 'state' => '');
return array('class' => Step3::class, 'state' => '');
}
public function Display(WebPage $oPage)