From 44f30ad51e39ad89f3a9450b38fc9d02c9b7ec85 Mon Sep 17 00:00:00 2001
From: Ian Morland <16573496+imorland@users.noreply.github.com>
Date: Thu, 28 Jul 2022 21:09:42 +0100
Subject: [PATCH] Replace event helper with event dispatcher (#3570)

---
 extensions/tags/src/Command/CreateTagHandler.php | 14 +++++++++++---
 extensions/tags/src/Command/DeleteTagHandler.php | 14 +++++++++++---
 extensions/tags/src/Command/EditTagHandler.php   | 12 ++++++++++--
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/extensions/tags/src/Command/CreateTagHandler.php b/extensions/tags/src/Command/CreateTagHandler.php
index 1349d2f09..3409a562d 100644
--- a/extensions/tags/src/Command/CreateTagHandler.php
+++ b/extensions/tags/src/Command/CreateTagHandler.php
@@ -12,6 +12,7 @@ namespace Flarum\Tags\Command;
 use Flarum\Tags\Event\Creating;
 use Flarum\Tags\Tag;
 use Flarum\Tags\TagValidator;
+use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Support\Arr;
 
 class CreateTagHandler
@@ -22,11 +23,18 @@ class CreateTagHandler
     protected $validator;
 
     /**
-     * @param TagValidator $validator
+     * @var Dispatcher
      */
-    public function __construct(TagValidator $validator)
+    protected $events;
+
+    /**
+     * @param TagValidator $validator
+     * @param Dispatcher $events
+     */
+    public function __construct(TagValidator $validator, Dispatcher $events)
     {
         $this->validator = $validator;
+        $this->events = $events;
     }
 
     /**
@@ -65,7 +73,7 @@ class CreateTagHandler
             }
         }
 
-        event(new Creating($tag, $actor, $data));
+        $this->events->dispatch(new Creating($tag, $actor, $data));
 
         $this->validator->assertValid($tag->getAttributes());
 
diff --git a/extensions/tags/src/Command/DeleteTagHandler.php b/extensions/tags/src/Command/DeleteTagHandler.php
index 5df37960c..d2c20267b 100644
--- a/extensions/tags/src/Command/DeleteTagHandler.php
+++ b/extensions/tags/src/Command/DeleteTagHandler.php
@@ -11,6 +11,7 @@ namespace Flarum\Tags\Command;
 
 use Flarum\Tags\Event\Deleting;
 use Flarum\Tags\TagRepository;
+use Illuminate\Contracts\Events\Dispatcher;
 
 class DeleteTagHandler
 {
@@ -20,11 +21,18 @@ class DeleteTagHandler
     protected $tags;
 
     /**
-     * @param TagRepository $tags
+     * @var Dispatcher
      */
-    public function __construct(TagRepository $tags)
+    protected $events;
+
+    /**
+     * @param TagRepository $tags
+     * @param Dispatcher $events
+     */
+    public function __construct(TagRepository $tags, Dispatcher $events)
     {
         $this->tags = $tags;
+        $this->events = $events;
     }
 
     /**
@@ -40,7 +48,7 @@ class DeleteTagHandler
 
         $actor->assertCan('delete', $tag);
 
-        event(new Deleting($tag, $actor));
+        $this->events->dispatch(new Deleting($tag, $actor));
 
         $tag->delete();
 
diff --git a/extensions/tags/src/Command/EditTagHandler.php b/extensions/tags/src/Command/EditTagHandler.php
index bedbedbd5..f13a4534b 100644
--- a/extensions/tags/src/Command/EditTagHandler.php
+++ b/extensions/tags/src/Command/EditTagHandler.php
@@ -12,6 +12,7 @@ namespace Flarum\Tags\Command;
 use Flarum\Tags\Event\Saving;
 use Flarum\Tags\TagRepository;
 use Flarum\Tags\TagValidator;
+use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Support\Arr;
 
 class EditTagHandler
@@ -26,14 +27,21 @@ class EditTagHandler
      */
     protected $validator;
 
+    /**
+     * @var Dispatcher
+     */
+    protected $events;
+
     /**
      * @param TagRepository $tags
      * @param TagValidator $validator
+     * @param Dispatcher $events
      */
-    public function __construct(TagRepository $tags, TagValidator $validator)
+    public function __construct(TagRepository $tags, TagValidator $validator, Dispatcher $events)
     {
         $this->tags = $tags;
         $this->validator = $validator;
+        $this->events = $events;
     }
 
     /**
@@ -80,7 +88,7 @@ class EditTagHandler
             $tag->is_restricted = (bool) $attributes['isRestricted'];
         }
 
-        event(new Saving($tag, $actor, $data));
+        $this->events->dispatch(new Saving($tag, $actor, $data));
 
         $this->validator->assertValid($tag->getDirty());