composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-08-18 03:38:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°9670 - enhance log msg

Browse Source
This commit is contained in:
odain
2026-06-10 10:14:04 +02:00
parent ab49b51b8f
commit 4d25e955d1
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
setup/runtimeenv.class.inc.php
View File

@@ -1479,28 +1479,31 @@ class RunTimeEnvironment
// Check that all the extensions have a code
$aNoCodeExtensionSourceDirs = [];
$bSetupFailure = false;
$aNoCodeExtensionLabelsThatBreakSetup = [];
foreach ($oExtensionsMap->GetAllExtensions() as $oExtension) {
if (in_array($oExtension->sCode, $aSelectedExtensionCodes)) {
$oExtension->bMarkedAsChosen = in_array($oExtension->sCode, $aSelectedExtensionCodes);
}
if (empty($oExtension->sCode)) {
if ($oExtension->bMarkedAsChosen){
$bSetupFailure = true;
}
if (empty($oExtension->sLabel)){
if (empty($oExtension->sLabel)) {
$sExtensionLabel = $oExtension->sSourceDir;
$aNoCodeExtensionSourceDirs = [$oExtension->sSourceDir];
} else {
$sExtensionLabel = $oExtension->sLabel;
$aNoCodeExtensionSourceDirs = [$sExtensionLabel => $oExtension->sSourceDir];
}
if ($oExtension->bMarkedAsChosen) {
$aNoCodeExtensionLabelsThatBreakSetup[]= $sExtensionLabel;
$bSetupFailure = true;
}
}
}
if (count($aNoCodeExtensionSourceDirs) >0){
if ($bSetupFailure){
$sErrorMessage = 'Selected extension(s) cannot be installed: Missing extension code';
if (count($aNoCodeExtensionSourceDirs) > 0) {
if ($bSetupFailure) {
$sErrorMessage = sprintf('Selected extension(s) cannot be installed: Missing extension code (%s)', implode(',', $aNoCodeExtensionLabelsThatBreakSetup));
$e = new CoreException($sErrorMessage);
SetupLog::Exception($sErrorMessage, $e, null, $aNoCodeExtensionSourceDirs);
throw $e;

4
tests/php-unit-tests/unitary-tests/setup/RunTimeEnvironmentTest.php
View File

@@ -70,7 +70,7 @@ XML;
$oRunTimeEnvironment = $this->CreateRunTimeEnvironment($sToken);
$this->expectException(Exception::class);
$this->expectExceptionMessage('Selected extension(s) cannot be installed: Missing extension code');
$this->expectExceptionMessage("Selected extension(s) cannot be installed: Missing extension code (Broken extension)");
$oRunTimeEnvironment->DoCompile([""], [], [], $sSourceDirRelative, $sExtensionsDirRelative);
}
@@ -93,7 +93,7 @@ XML;
$oRunTimeEnvironment = $this->CreateRunTimeEnvironment($sToken);
$this->expectException(Exception::class);
$this->expectExceptionMessage('Selected extension(s) cannot be installed: Missing extension code');
$this->expectExceptionMessage("Selected extension(s) cannot be installed: Missing extension code ($sExtensionsDirAbsolute)");
$oRunTimeEnvironment->DoCompile([""], [], [], $sSourceDirRelative, $sExtensionsDirRelative, false);
}