diff --git a/extensions/lock/src/Access/DiscussionPolicy.php b/extensions/lock/src/Access/DiscussionPolicy.php
index a8432bfd2..535ba1ed7 100755
--- a/extensions/lock/src/Access/DiscussionPolicy.php
+++ b/extensions/lock/src/Access/DiscussionPolicy.php
@@ -13,7 +13,6 @@ namespace Flarum\Lock\Access;
 use Flarum\Core\Access\AbstractPolicy;
 use Flarum\Core\Discussion;
 use Flarum\Core\User;
-use Illuminate\Contracts\Events\Dispatcher;
 
 class DiscussionPolicy extends AbstractPolicy
 {
diff --git a/extensions/lock/src/Event/DiscussionWasLocked.php b/extensions/lock/src/Event/DiscussionWasLocked.php
index 1fbe4e38f..f49c46d66 100644
--- a/extensions/lock/src/Event/DiscussionWasLocked.php
+++ b/extensions/lock/src/Event/DiscussionWasLocked.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/lock/src/Event/DiscussionWasUnlocked.php b/extensions/lock/src/Event/DiscussionWasUnlocked.php
index 25dc3fc70..9940090c7 100644
--- a/extensions/lock/src/Event/DiscussionWasUnlocked.php
+++ b/extensions/lock/src/Event/DiscussionWasUnlocked.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/lock/src/Gambit/LockedGambit.php b/extensions/lock/src/Gambit/LockedGambit.php
index 88a60fea1..4f227e369 100644
--- a/extensions/lock/src/Gambit/LockedGambit.php
+++ b/extensions/lock/src/Gambit/LockedGambit.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/lock/src/Listener/AddDiscussionLockedAttributes.php b/extensions/lock/src/Listener/AddDiscussionLockedAttributes.php
index a62dc431e..e0406b885 100755
--- a/extensions/lock/src/Listener/AddDiscussionLockedAttributes.php
+++ b/extensions/lock/src/Listener/AddDiscussionLockedAttributes.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/lock/src/Listener/CreatePostWhenDiscussionIsLocked.php b/extensions/lock/src/Listener/CreatePostWhenDiscussionIsLocked.php
index eba69d528..82f186782 100755
--- a/extensions/lock/src/Listener/CreatePostWhenDiscussionIsLocked.php
+++ b/extensions/lock/src/Listener/CreatePostWhenDiscussionIsLocked.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/lock/src/Listener/SaveLockedToDatabase.php b/extensions/lock/src/Listener/SaveLockedToDatabase.php
index b391ce437..543ffc634 100755
--- a/extensions/lock/src/Listener/SaveLockedToDatabase.php
+++ b/extensions/lock/src/Listener/SaveLockedToDatabase.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/lock/src/Notification/DiscussionLockedBlueprint.php b/extensions/lock/src/Notification/DiscussionLockedBlueprint.php
index 3399723ec..5808bd92c 100644
--- a/extensions/lock/src/Notification/DiscussionLockedBlueprint.php
+++ b/extensions/lock/src/Notification/DiscussionLockedBlueprint.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/extensions/lock/src/Post/DiscussionLockedPost.php b/extensions/lock/src/Post/DiscussionLockedPost.php
index a8c5a227d..ddb62a9af 100755
--- a/extensions/lock/src/Post/DiscussionLockedPost.php
+++ b/extensions/lock/src/Post/DiscussionLockedPost.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 /*
  * This file is part of Flarum.
  *
@@ -50,19 +51,19 @@ class DiscussionLockedPost extends AbstractEventPost implements MergeableInterfa
     /**
      * Create a new instance in reply to a discussion.
      *
-     * @param integer $discussionId
-     * @param integer $userId
-     * @param boolean $isLocked
+     * @param int $discussionId
+     * @param int $userId
+     * @param bool $isLocked
      * @return static
      */
     public static function reply($discussionId, $userId, $isLocked)
     {
         $post = new static;
 
-        $post->content       = static::buildContent($isLocked);
-        $post->time          = time();
+        $post->content = static::buildContent($isLocked);
+        $post->time = time();
         $post->discussion_id = $discussionId;
-        $post->user_id       = $userId;
+        $post->user_id = $userId;
 
         return $post;
     }
@@ -70,7 +71,7 @@ class DiscussionLockedPost extends AbstractEventPost implements MergeableInterfa
     /**
      * Build the content attribute.
      *
-     * @param boolean $isLocked Whether or not the discussion is stickied.
+     * @param bool $isLocked Whether or not the discussion is stickied.
      * @return array
      */
     public static function buildContent($isLocked)