composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 22:39:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°9144 Check new step class before instanciating

Browse Source
This commit is contained in:
Timothee
2026-02-17 10:04:03 +01:00
parent defca2d31e
commit 0ace957a45
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,7 @@ class WizardController
public function Start()
{
$sCurrentStepClass = $this->sInitialStepClass;
$oStep = new $sCurrentStepClass($this, $this->sInitialState);
$oStep = $this->NewStep($sCurrentStepClass, $this->sInitialState);
$this->DisplayStep($oStep);
}
/**
@@ -169,7 +169,7 @@ class WizardController
$sCurrentStepClass = utils::ReadParam('_class', $this->sInitialStepClass);
$sCurrentState = utils::ReadParam('_state', $this->sInitialState);
/** @var \WizardStep $oStep */
$oStep = new $sCurrentStepClass($this, $sCurrentState);
$oStep = $oStep = $this->NewStep($sCurrentStepClass, $sCurrentState);
if ($oStep->ValidateParams()) {
if ($oStep->CanComeBack()) {
$this->PushStep(['class' => $sCurrentStepClass, 'state' => $sCurrentState]);
@@ -177,7 +177,7 @@ class WizardController
$aPossibleSteps = $oStep->GetPossibleSteps();
$aNextStepInfo = $oStep->UpdateWizardStateAndGetNextStep(true); // true => moving forward
if (in_array($aNextStepInfo['class'], $aPossibleSteps)) {
$oNextStep = new $aNextStepInfo['class']($this, $aNextStepInfo['state']);
$oNextStep = $this->NewStep($aNextStepInfo['class'], $aNextStepInfo['state']);
$this->DisplayStep($oNextStep);
} else {
throw new Exception("Internal error: Unexpected next step '{$aNextStepInfo['class']}'. The possible next steps are: ".implode(', ', $aPossibleSteps));
@@ -194,12 +194,12 @@ class WizardController
// let the current step save its parameters
$sCurrentStepClass = utils::ReadParam('_class', $this->sInitialStepClass);
$sCurrentState = utils::ReadParam('_state', $this->sInitialState);
$oStep = new $sCurrentStepClass($this, $sCurrentState);
$oStep = $this->NewStep($sCurrentStepClass, $sCurrentState);
$aNextStepInfo = $oStep->UpdateWizardStateAndGetNextStep(false); // false => Moving backwards
// Display the previous step
$aCurrentStepInfo = $this->PopStep();
$oStep = new $aCurrentStepInfo['class']($this, $aCurrentStepInfo['state']);
$oStep = $this->NewStep($aCurrentStepInfo['class'], $aCurrentStepInfo['state']);
$this->DisplayStep($oStep);
}
@@ -341,7 +341,7 @@ on the page's parameters
$sStep = $this->sInitialStepClass;
}
$oStep = new $sStep($this, '');
$oStep = $this->NewStep($sStep);
$aAllSteps[$sStep] = $oStep->GetPossibleSteps();
foreach ($aAllSteps[$sStep] as $sNextStep) {
if (!array_key_exists($sNextStep, $aAllSteps)) {
@@ -373,7 +373,7 @@ on the page's parameters
$sOutput .= "\tnode [shape = doublecircle]; ".implode(' ', $aDeadEnds).";\n";
$sOutput .= "\tnode [shape = box];\n";
foreach ($aAllSteps as $sStep => $aNextSteps) {
$oStep = new $sStep($this, '');
$oStep = $this->NewStep($sStep);
$sOutput .= "\t$sStep [ label = \"".$oStep->GetTitle()."\"];\n";
if (count($aNextSteps) > 0) {
foreach ($aNextSteps as $sNextStep) {
@@ -384,4 +384,19 @@ on the page's parameters
$sOutput .= "}\n";
return $sOutput;
}
/**
* @param $sCurrentStepClass
* @param $sCurrentState
*
* @return \WizardStep
* @throws \Exception
*/
private function NewStep($sCurrentStepClass, $sCurrentState = '')
{
if (!is_subclass_of($sCurrentStepClass, WizardStep::class)) {
throw new Exception('Unknown step '.$sCurrentStepClass);
}
return new $sCurrentStepClass($this, $sCurrentState);
}
}

2
setup/wizardsteps/AbstractWizStepInstall.php
View File

@@ -92,7 +92,7 @@ abstract class AbstractWizStepInstall extends WizardStep
'language' => $this->oWizard->GetParameter('default_language'),
'selected_modules' => $aSelectedModules,
'selected_extensions' => $aSelectedExtensions,
'sample_data' => ($this->oWizard->GetParameter('sample_data', '') == 'yes') ? true : false ,
'sample_data' => $this->oWizard->GetParameter('sample_data', '') === 'yes',
'old_addon' => $this->oWizard->GetParameter('old_addon', false), // whether or not to use the "old" userrights profile addon
'options' => json_decode($this->oWizard->GetParameter('misc_options', '[]'), true),
'mysql_bindir' => $this->oWizard->GetParameter('mysql_bindir'),

2
setup/wizardsteps/WizStepSummary.php
View File

@@ -144,7 +144,7 @@ class WizStepSummary extends AbstractWizStepInstall
$oPage->add('<li>URL to access the application: '.$aInstallParams['url'].'</li>');
$oPage->add('<li>Graphviz\' dot path: '.$aInstallParams['graphviz_path'].'</li>');
if ($aInstallParams['sample_data'] == 'yes') {
if ($aInstallParams['sample_data']) {
$oPage->add('<li>Sample data will be loaded into the database.</li>');
}
if ($aInstallParams['old_addon']) {