composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-23 09:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°9567 - ci fix Implicitly marking parameter $oConfig as nullable is deprecated

Browse Source
This commit is contained in:
odain
2026-05-22 07:50:00 +02:00
parent 3df12bba46
commit c156c09be0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/setuputils.class.inc.php
View File

@@ -1576,7 +1576,7 @@ JS
* @return array
* @throws Exception
*/
public static function AnalyzeInstallation($oWizard, $bAbortOnMissingDependency = false, $aModulesToLoad = null, Config $oConfig = null)
public static function AnalyzeInstallation($oWizard, $bAbortOnMissingDependency = false, $aModulesToLoad = null, ?Config $oConfig = null)
{
require_once(APPROOT.'/setup/moduleinstaller.class.inc.php');

5
setup/wizardsteps/WizStepModulesChoice.php
View File

@@ -80,7 +80,9 @@ class WizStepModulesChoice extends AbstractWizStepInstall
// Sanity check (not stopper, to let developers go further...)
try {
$this->aAnalyzeInstallationModules = SetupUtils::AnalyzeInstallation($this->oWizard, true, null, $this->oConfig);
$aModulesToLoad = json_decode($oWizard->GetParameter('selected_modules'), true) ?? null;
SetupLog::Error(__METHOD__, null, [$aModulesToLoad]);
$this->aAnalyzeInstallationModules = SetupUtils::AnalyzeInstallation($this->oWizard, true, $aModulesToLoad, $this->oConfig);
} catch (MissingDependencyException $e) {
$this->oMissingDependencyException = $e;
$this->aAnalyzeInstallationModules = SetupUtils::AnalyzeInstallation($this->oWizard);
@@ -187,7 +189,6 @@ class WizStepModulesChoice extends AbstractWizStepInstall
public function GetSelectedComponents(array $aSteps, string $sSelectedExtensionJson): array
{
SetupLog::Error(__METHOD__, null, $aSteps);
$aExtensions = json_decode($sSelectedExtensionJson, true);
$aRes = [];
foreach ($aSteps as $i => $aStepInfo) {