From 2237e597d04b4300ecce07a76c2be228df41a5e4 Mon Sep 17 00:00:00 2001
From: Matt Kilgore <tankerkiller125@gmail.com>
Date: Sun, 19 Jul 2020 17:37:27 -0400
Subject: [PATCH] Removes AssertPermissionTrait (#90)

* Removes AssertPermissionTrait

* Apply fixes from StyleCI

Co-authored-by: luceos <daniel+github@klabbers.email>
---
 extensions/tags/src/Api/Controller/OrderTagsController.php | 5 +----
 extensions/tags/src/Command/CreateTagHandler.php           | 5 +----
 extensions/tags/src/Command/DeleteTagHandler.php           | 5 +----
 extensions/tags/src/Command/EditTagHandler.php             | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/extensions/tags/src/Api/Controller/OrderTagsController.php b/extensions/tags/src/Api/Controller/OrderTagsController.php
index b0ff08430..ac4397823 100644
--- a/extensions/tags/src/Api/Controller/OrderTagsController.php
+++ b/extensions/tags/src/Api/Controller/OrderTagsController.php
@@ -10,7 +10,6 @@
 namespace Flarum\Tags\Api\Controller;
 
 use Flarum\Tags\Tag;
-use Flarum\User\AssertPermissionTrait;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -18,14 +17,12 @@ use Psr\Http\Server\RequestHandlerInterface;
 
 class OrderTagsController implements RequestHandlerInterface
 {
-    use AssertPermissionTrait;
-
     /**
      * {@inheritdoc}
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $order = array_get($request->getParsedBody(), 'order');
 
diff --git a/extensions/tags/src/Command/CreateTagHandler.php b/extensions/tags/src/Command/CreateTagHandler.php
index 9133cdf27..cc3cc5757 100644
--- a/extensions/tags/src/Command/CreateTagHandler.php
+++ b/extensions/tags/src/Command/CreateTagHandler.php
@@ -12,12 +12,9 @@ namespace Flarum\Tags\Command;
 use Flarum\Tags\Event\Creating;
 use Flarum\Tags\Tag;
 use Flarum\Tags\TagValidator;
-use Flarum\User\AssertPermissionTrait;
 
 class CreateTagHandler
 {
-    use AssertPermissionTrait;
-
     /**
      * @var TagValidator
      */
@@ -40,7 +37,7 @@ class CreateTagHandler
         $actor = $command->actor;
         $data = $command->data;
 
-        $this->assertCan($actor, 'createTag');
+        $actor->assertCan('createTag');
 
         $tag = Tag::build(
             array_get($data, 'attributes.name'),
diff --git a/extensions/tags/src/Command/DeleteTagHandler.php b/extensions/tags/src/Command/DeleteTagHandler.php
index 1edb140b5..5df37960c 100644
--- a/extensions/tags/src/Command/DeleteTagHandler.php
+++ b/extensions/tags/src/Command/DeleteTagHandler.php
@@ -11,12 +11,9 @@ namespace Flarum\Tags\Command;
 
 use Flarum\Tags\Event\Deleting;
 use Flarum\Tags\TagRepository;
-use Flarum\User\AssertPermissionTrait;
 
 class DeleteTagHandler
 {
-    use AssertPermissionTrait;
-
     /**
      * @var TagRepository
      */
@@ -41,7 +38,7 @@ class DeleteTagHandler
 
         $tag = $this->tags->findOrFail($command->tagId, $actor);
 
-        $this->assertCan($actor, 'delete', $tag);
+        $actor->assertCan('delete', $tag);
 
         event(new Deleting($tag, $actor));
 
diff --git a/extensions/tags/src/Command/EditTagHandler.php b/extensions/tags/src/Command/EditTagHandler.php
index c1a348b0f..6ee2d09f3 100644
--- a/extensions/tags/src/Command/EditTagHandler.php
+++ b/extensions/tags/src/Command/EditTagHandler.php
@@ -12,12 +12,9 @@ namespace Flarum\Tags\Command;
 use Flarum\Tags\Event\TagWillBeSaved;
 use Flarum\Tags\TagRepository;
 use Flarum\Tags\TagValidator;
-use Flarum\User\AssertPermissionTrait;
 
 class EditTagHandler
 {
-    use AssertPermissionTrait;
-
     /**
      * @var TagRepository
      */
@@ -50,7 +47,7 @@ class EditTagHandler
 
         $tag = $this->tags->findOrFail($command->tagId, $actor);
 
-        $this->assertCan($actor, 'edit', $tag);
+        $actor->assertCan('edit', $tag);
 
         $attributes = array_get($data, 'attributes', []);