diff --git a/setup/extensionsmap.class.inc.php b/setup/extensionsmap.class.inc.php index b45240c392..3e8e0f0abb 100644 --- a/setup/extensionsmap.class.inc.php +++ b/setup/extensionsmap.class.inc.php @@ -447,8 +447,6 @@ class iTopExtensionsMap return $aRes; } - - /** * Mark the given extension as chosen * @param string $sExtensionCode The code of the extension (code without version number) diff --git a/setup/itopextension.class.inc.php b/setup/itopextension.class.inc.php index 532bc0bedf..d1e80217be 100644 --- a/setup/itopextension.class.inc.php +++ b/setup/itopextension.class.inc.php @@ -142,7 +142,8 @@ class iTopExtension return true; } - public function GetExtensionSourceLabel(): string { + public function GetExtensionSourceLabel(): string + { return match ($this->sSource) { iTopExtension::SOURCE_MANUAL => 'Local extensions folder', iTopExtension::SOURCE_REMOTE => (ITOP_APPLICATION == 'iTop') ? 'iTop Hub' : 'ITSM Designer', diff --git a/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php b/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php index 2861a47fe6..ccf2a0dbdc 100644 --- a/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php +++ b/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php @@ -33,8 +33,7 @@ class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory if ($bMissingFromDisk) { $oExtensionDetails->GetToggler()->SetIsToggled(false); $oExtensionDetails->GetToggler()->SetIsDisabled(true); - } - else if (!$bUninstallable) { + } elseif (!$bUninstallable) { $oExtensionDetails->AllowForceUninstall(); $oExtensionDetails->GetToggler()->SetIsDisabled(true); } diff --git a/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php b/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php index 619d831536..a1bb135d05 100644 --- a/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php +++ b/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php @@ -642,7 +642,6 @@ $oColumnLeft->AddSubBlock($oExtensionDetailInstalledFromFactory); $oExtensionDetailInstalledFromFactory = ExtensionDetailsUIBlockFactory::MakeInstalled('itop-not-uninstallable', 'You cannot uninstall me', 'Click force uninstall to uninstall me', ['v9.9.9', 'Void', '12/12/2012'], ['uninstallable' => false,'missing' => false]); $oColumnLeft->AddSubBlock($oExtensionDetailInstalledFromFactory); - $oExtensionDetailInstalledWithLongTitle = ExtensionDetailsUIBlockFactory::MakeNotInstalled('itop-sample', 'My extension with a very long title', 'This is for test only', ['v1.1.1', 'Designer', '12/12/2012'], ['uninstallable' => false]); $oColumnRight->AddSubBlock($oExtensionDetailInstalledWithLongTitle); $oPage->add('