OXDEV-8216: Move getting of current shop id out of try/catch block

OXID-eSales · Aug 12, 2024 · 6d7dc0a · 6d7dc0a
1 parent f48ea1f
commit 6d7dc0a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Module/Service/ModuleActivationService.php b/src/Module/Service/ModuleActivationService.php
@@ -27,8 +27,9 @@ public function __construct(
      */
     public function activateModule(string $moduleId): bool
     {
+        $shopId = $this->context->getCurrentShopId();
+
         try {
-            $shopId = $this->context->getCurrentShopId();
             $this->moduleActivationBridge->activate(moduleId: $moduleId, shopId: $shopId);
         } catch (\Exception $exception) {
             throw new ModuleActivationException();
@@ -42,8 +43,9 @@ public function activateModule(string $moduleId): bool
      */
     public function deactivateModule(string $moduleId): bool
     {
+        $shopId = $this->context->getCurrentShopId();
+
         try {
-            $shopId = $this->context->getCurrentShopId();
             $this->moduleActivationBridge->deactivate(moduleId: $moduleId, shopId: $shopId);
         } catch (\Exception $exception) {
             throw new ModuleDeactivationException();