OXDEV-8489 Extended ModuleDeactivationException

OXID-eSales · Jul 15, 2024 · 9a335e2 · 9a335e2
1 parent eda1e03
commit 9a335e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Module/Exception/ModuleDeactivationException.php b/src/Module/Exception/ModuleDeactivationException.php
@@ -13,10 +13,14 @@
 
 final class ModuleDeactivationException extends NotFound
 {
-    public const EXCEPTION_MESSAGE = "This Module is in the blocklist and cannot be deactivated.";
+    public const EXCEPTION_MESSAGE = "An error occurred while deactivating the module.";
+    public const BLOCKED_MODULE_MESSAGE = 'Module "%s" is in the blocklist and cannot be deactivated.';
 
-    public function __construct()
+    public function __construct(string $message = null)
     {
-        parent::__construct(self::EXCEPTION_MESSAGE);
+        if (empty($message)) {
+            $message = self::EXCEPTION_MESSAGE;
+        }
+        parent::__construct($message);
     }
 }
diff --git a/src/Module/Service/ModuleSwitchService.php b/src/Module/Service/ModuleSwitchService.php
@@ -34,7 +34,9 @@ public function activateModule(string $moduleId): bool
     public function deactivateModule(string $moduleId): bool
     {
         if ($this->moduleBlocklistService->isModuleBlocked($moduleId)) {
-            throw new ModuleDeactivationException();
+            throw new ModuleDeactivationException(
+                sprintf(ModuleDeactivationException::BLOCKED_MODULE_MESSAGE, $moduleId)
+            );
         }
         return $this->moduleSwitchInfrastructure->deactivateModule(moduleId: $moduleId);
     }