diff --git a/extensions/tags/src/Access/DiscussionPolicy.php b/extensions/tags/src/Access/DiscussionPolicy.php
index 1a18154b7..199cf77a6 100755
--- a/extensions/tags/src/Access/DiscussionPolicy.php
+++ b/extensions/tags/src/Access/DiscussionPolicy.php
@@ -23,7 +23,6 @@ use Illuminate\Database\Query\Expression;
 
 class DiscussionPolicy extends AbstractPolicy
 {
-
     /**
      * {@inheritdoc}
      */
@@ -73,7 +72,7 @@ class DiscussionPolicy extends AbstractPolicy
 
             foreach ($tags as $tag) {
                 if ($tag->is_restricted) {
-                    if ($actor->hasPermission('tag' . $tag->id . '.discussion.' . $ability)) {
+                    if ($actor->hasPermission('tag'.$tag->id.'.discussion.'.$ability)) {
                         return true;
                     }
                 } else {
diff --git a/extensions/tags/src/Access/TagPolicy.php b/extensions/tags/src/Access/TagPolicy.php
index a5fc40844..c64ba2a93 100755
--- a/extensions/tags/src/Access/TagPolicy.php
+++ b/extensions/tags/src/Access/TagPolicy.php
@@ -39,7 +39,7 @@ class TagPolicy extends AbstractPolicy
     public function startDiscussion(User $actor, Tag $tag)
     {
         if ((! $tag->is_restricted && $actor->hasPermission('startDiscussion'))
-            || $actor->hasPermission('tag' . $tag->id . '.startDiscussion')) {
+            || $actor->hasPermission('tag'.$tag->id.'.startDiscussion')) {
             return true;
         }
     }
diff --git a/extensions/tags/src/Api/Controller/CreateTagController.php b/extensions/tags/src/Api/Controller/CreateTagController.php
index 98f1b0d67..c9e1e61c8 100644
--- a/extensions/tags/src/Api/Controller/CreateTagController.php
+++ b/extensions/tags/src/Api/Controller/CreateTagController.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
@@ -20,7 +21,7 @@ use Tobscure\JsonApi\Document;
 class CreateTagController extends AbstractCreateController
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public $serializer = TagSerializer::class;
 
diff --git a/extensions/tags/src/Api/Controller/DeleteTagController.php b/extensions/tags/src/Api/Controller/DeleteTagController.php
index 856d2da3c..bd5884c30 100644
--- a/extensions/tags/src/Api/Controller/DeleteTagController.php
+++ b/extensions/tags/src/Api/Controller/DeleteTagController.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Api/Controller/OrderTagsController.php b/extensions/tags/src/Api/Controller/OrderTagsController.php
index 6fd341a36..827ecb8f3 100644
--- a/extensions/tags/src/Api/Controller/OrderTagsController.php
+++ b/extensions/tags/src/Api/Controller/OrderTagsController.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Api/Controller/UpdateTagController.php b/extensions/tags/src/Api/Controller/UpdateTagController.php
index 6166e8856..4f79259d4 100644
--- a/extensions/tags/src/Api/Controller/UpdateTagController.php
+++ b/extensions/tags/src/Api/Controller/UpdateTagController.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
@@ -20,7 +21,7 @@ use Tobscure\JsonApi\Document;
 class UpdateTagController extends AbstractResourceController
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public $serializer = TagSerializer::class;
 
diff --git a/extensions/tags/src/Api/Serializer/TagSerializer.php b/extensions/tags/src/Api/Serializer/TagSerializer.php
index 9a775bdef..256dd4d91 100644
--- a/extensions/tags/src/Api/Serializer/TagSerializer.php
+++ b/extensions/tags/src/Api/Serializer/TagSerializer.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
@@ -54,7 +55,7 @@ class TagSerializer extends AbstractSerializer
      */
     protected function parent($tag)
     {
-        return $this->hasOne($tag, TagSerializer::class);
+        return $this->hasOne($tag, self::class);
     }
 
     /**
diff --git a/extensions/tags/src/Command/CreateTag.php b/extensions/tags/src/Command/CreateTag.php
index 2109a63ef..3154edf2f 100644
--- a/extensions/tags/src/Command/CreateTag.php
+++ b/extensions/tags/src/Command/CreateTag.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Command/CreateTagHandler.php b/extensions/tags/src/Command/CreateTagHandler.php
index a0c88f896..d3f9a900e 100644
--- a/extensions/tags/src/Command/CreateTagHandler.php
+++ b/extensions/tags/src/Command/CreateTagHandler.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Command/DeleteTag.php b/extensions/tags/src/Command/DeleteTag.php
index f1f6f43d5..95d0b2c4e 100644
--- a/extensions/tags/src/Command/DeleteTag.php
+++ b/extensions/tags/src/Command/DeleteTag.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Command/DeleteTagHandler.php b/extensions/tags/src/Command/DeleteTagHandler.php
index 40c1de517..cac521c40 100644
--- a/extensions/tags/src/Command/DeleteTagHandler.php
+++ b/extensions/tags/src/Command/DeleteTagHandler.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Command/EditTag.php b/extensions/tags/src/Command/EditTag.php
index aa51c311e..6899019bc 100644
--- a/extensions/tags/src/Command/EditTag.php
+++ b/extensions/tags/src/Command/EditTag.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Command/EditTagHandler.php b/extensions/tags/src/Command/EditTagHandler.php
index d4a335109..fc6a3b218 100644
--- a/extensions/tags/src/Command/EditTagHandler.php
+++ b/extensions/tags/src/Command/EditTagHandler.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Event/DiscussionWasTagged.php b/extensions/tags/src/Event/DiscussionWasTagged.php
index 055373ce6..14f58d32f 100644
--- a/extensions/tags/src/Event/DiscussionWasTagged.php
+++ b/extensions/tags/src/Event/DiscussionWasTagged.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Gambit/TagGambit.php b/extensions/tags/src/Gambit/TagGambit.php
index 5dda52b32..966ff2e62 100644
--- a/extensions/tags/src/Gambit/TagGambit.php
+++ b/extensions/tags/src/Gambit/TagGambit.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Listener/AddDiscussionTagsRelationship.php b/extensions/tags/src/Listener/AddDiscussionTagsRelationship.php
index d63d97d13..808b02557 100755
--- a/extensions/tags/src/Listener/AddDiscussionTagsRelationship.php
+++ b/extensions/tags/src/Listener/AddDiscussionTagsRelationship.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Listener/AddForumTagsRelationship.php b/extensions/tags/src/Listener/AddForumTagsRelationship.php
index c7ceba820..533436295 100755
--- a/extensions/tags/src/Listener/AddForumTagsRelationship.php
+++ b/extensions/tags/src/Listener/AddForumTagsRelationship.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Listener/AddTagsApi.php b/extensions/tags/src/Listener/AddTagsApi.php
index c5986ece1..29f66d846 100755
--- a/extensions/tags/src/Listener/AddTagsApi.php
+++ b/extensions/tags/src/Listener/AddTagsApi.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
@@ -10,8 +11,8 @@
 
 namespace Flarum\Tags\Listener;
 
-use Flarum\Tags\Api\Controller;
 use Flarum\Event\ConfigureApiRoutes;
+use Flarum\Tags\Api\Controller;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class AddTagsApi
diff --git a/extensions/tags/src/Listener/CreatePostWhenTagsAreChanged.php b/extensions/tags/src/Listener/CreatePostWhenTagsAreChanged.php
index 5ea3a6470..0e5fb2027 100755
--- a/extensions/tags/src/Listener/CreatePostWhenTagsAreChanged.php
+++ b/extensions/tags/src/Listener/CreatePostWhenTagsAreChanged.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Listener/FilterDiscussionListByTags.php b/extensions/tags/src/Listener/FilterDiscussionListByTags.php
index 82a77b040..6400f1432 100755
--- a/extensions/tags/src/Listener/FilterDiscussionListByTags.php
+++ b/extensions/tags/src/Listener/FilterDiscussionListByTags.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Listener/SaveTagsToDatabase.php b/extensions/tags/src/Listener/SaveTagsToDatabase.php
index db8937564..30a4b0b4a 100755
--- a/extensions/tags/src/Listener/SaveTagsToDatabase.php
+++ b/extensions/tags/src/Listener/SaveTagsToDatabase.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Listener/UpdateTagMetadata.php b/extensions/tags/src/Listener/UpdateTagMetadata.php
index 0b3a686c9..e0a37590a 100755
--- a/extensions/tags/src/Listener/UpdateTagMetadata.php
+++ b/extensions/tags/src/Listener/UpdateTagMetadata.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/tags/src/Post/DiscussionTaggedPost.php b/extensions/tags/src/Post/DiscussionTaggedPost.php
index 3970a1e12..6ef72c3b1 100755
--- a/extensions/tags/src/Post/DiscussionTaggedPost.php
+++ b/extensions/tags/src/Post/DiscussionTaggedPost.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
@@ -51,8 +52,8 @@ class DiscussionTaggedPost extends AbstractEventPost implements MergeableInterfa
     /**
      * Create a new instance in reply to a discussion.
      *
-     * @param integer $discussionId
-     * @param integer $userId
+     * @param int $discussionId
+     * @param int $userId
      * @param array $oldTagIds
      * @param array $newTagIds
      * @return static
@@ -61,10 +62,10 @@ class DiscussionTaggedPost extends AbstractEventPost implements MergeableInterfa
     {
         $post = new static;
 
-        $post->content       = static::buildContent($oldTagIds, $newTagIds);
-        $post->time          = time();
+        $post->content = static::buildContent($oldTagIds, $newTagIds);
+        $post->time = time();
         $post->discussion_id = $discussionId;
-        $post->user_id       = $userId;
+        $post->user_id = $userId;
 
         return $post;
     }
diff --git a/extensions/tags/src/Tag.php b/extensions/tags/src/Tag.php
index d3ece4dd7..de099afe0 100644
--- a/extensions/tags/src/Tag.php
+++ b/extensions/tags/src/Tag.php
@@ -57,11 +57,11 @@ class Tag extends AbstractModel
     {
         $tag = new static;
 
-        $tag->name        = $name;
-        $tag->slug        = $slug;
+        $tag->name = $name;
+        $tag->slug = $slug;
         $tag->description = $description;
-        $tag->color       = $color;
-        $tag->is_hidden   = (bool) $isHidden;
+        $tag->color = $color;
+        $tag->is_hidden = (bool) $isHidden;
 
         return $tag;
     }
@@ -112,7 +112,7 @@ class Tag extends AbstractModel
      */
     public function setLastDiscussion(Discussion $discussion)
     {
-        $this->last_time          = $discussion->last_time;
+        $this->last_time = $discussion->last_time;
         $this->last_discussion_id = $discussion->id;
 
         return $this;
@@ -135,7 +135,7 @@ class Tag extends AbstractModel
         $hasGlobalPermission = $user->hasPermission($permission);
 
         foreach ($tags as $tag) {
-            if (($hasGlobalPermission && ! $tag->is_restricted) || $user->hasPermission('tag' . $tag->id . '.' . $permission)) {
+            if (($hasGlobalPermission && ! $tag->is_restricted) || $user->hasPermission('tag'.$tag->id.'.'.$permission)) {
                 $ids[] = $tag->id;
             }
         }
@@ -160,7 +160,7 @@ class Tag extends AbstractModel
         $hasGlobalPermission = $user->hasPermission($permission);
 
         foreach ($tags as $tag) {
-            if (($tag->is_restricted || ! $hasGlobalPermission) && ! $user->hasPermission('tag' . $tag->id . '.' . $permission)) {
+            if (($tag->is_restricted || ! $hasGlobalPermission) && ! $user->hasPermission('tag'.$tag->id.'.'.$permission)) {
                 $ids[] = $tag->id;
             }
         }
diff --git a/extensions/tags/src/TagRepository.php b/extensions/tags/src/TagRepository.php
index 755139035..76687ec5e 100644
--- a/extensions/tags/src/TagRepository.php
+++ b/extensions/tags/src/TagRepository.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
@@ -50,7 +51,7 @@ class TagRepository
      *
      * @param string $slug
      * @param User|null $user
-     * @return integer
+     * @return int
      */
     public function getIdForSlug($slug, User $user = null)
     {