Move legacy code of canAccessIssue to subscriber

eventum · May 5, 2020 · 9435b2c · 9435b2c
1 parent ed5611e
commit 9435b2c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/lib/eventum/class.workflow.php b/lib/eventum/class.workflow.php
@@ -992,15 +992,7 @@ public static function canAccessIssue($prj_id, $issue_id, $usr_id)
         $event = new GenericEvent(null, $arguments);
         EventManager::dispatch(SystemEvents::ACCESS_ISSUE, $event);
 
-        if ($event->isPropagationStopped()) {
-            return false;
-        }
-
-        if (!$backend = self::getBackend($prj_id)) {
-            return null;
-        }
-
-        return $backend->canAccessIssue($prj_id, $issue_id, $usr_id);
+        return $event->isPropagationStopped() ? false : true;
     }
 
     /**

diff --git a/src/Extension/Legacy/WorkflowLegacyExtension.php b/src/Extension/Legacy/WorkflowLegacyExtension.php
@@ -13,7 +13,10 @@
 
 namespace Eventum\Extension\Legacy;
 
+use Eventum\Event\SystemEvents;
 use Eventum\Extension\Provider;
+use Symfony\Component\EventDispatcher\GenericEvent;
+use Workflow;
 
 /**
  * Extension that adds integration of legacy workflow classes to Extension events
@@ -23,7 +26,23 @@ class WorkflowLegacyExtension implements Provider\SubscriberProvider
     public function getSubscribers(): array
     {
         return [
-
+            /** @see WorkflowLegacyExtension::canAccessIssue */
+            SystemEvents::ACCESS_ISSUE => ['canAccessIssue'],
         ];
     }
+
+    /**
+     * @see Workflow::canAccessIssue
+     */
+    public function canAccessIssue(GenericEvent $event): void
+    {
+        if (!$backend = Workflow::getBackend($event['prj_id'])) {
+            return;
+        }
+
+        $canAccess = $backend->canAccessIssue($event['prj_id'], $event['issue_id'], $event['usr_id']);
+        if ($canAccess === false) {
+            $event->stopPropagation();
+        }
+    }
 }