diff --git a/framework/core/src/Admin/Actions/ClientAction.php b/framework/core/src/Admin/Actions/ClientAction.php
index e0834468b..5973598cd 100644
--- a/framework/core/src/Admin/Actions/ClientAction.php
+++ b/framework/core/src/Admin/Actions/ClientAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Admin/AdminServiceProvider.php b/framework/core/src/Admin/AdminServiceProvider.php
index a9a041a99..e9de037dc 100644
--- a/framework/core/src/Admin/AdminServiceProvider.php
+++ b/framework/core/src/Admin/AdminServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Admin/Middleware/LoginWithCookieAndCheckAdmin.php b/framework/core/src/Admin/Middleware/LoginWithCookieAndCheckAdmin.php
index 4013d49b5..b1b0d6d72 100644
--- a/framework/core/src/Admin/Middleware/LoginWithCookieAndCheckAdmin.php
+++ b/framework/core/src/Admin/Middleware/LoginWithCookieAndCheckAdmin.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/AccessToken.php b/framework/core/src/Api/AccessToken.php
index 65e6d7d90..fdad6f4ec 100644
--- a/framework/core/src/Api/AccessToken.php
+++ b/framework/core/src/Api/AccessToken.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Action.php b/framework/core/src/Api/Actions/Action.php
index 41d4ff6a4..3c3041b09 100644
--- a/framework/core/src/Api/Actions/Action.php
+++ b/framework/core/src/Api/Actions/Action.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/ConfigAction.php b/framework/core/src/Api/Actions/ConfigAction.php
index 31f2b1d13..83ade88c5 100644
--- a/framework/core/src/Api/Actions/ConfigAction.php
+++ b/framework/core/src/Api/Actions/ConfigAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/CreateAction.php b/framework/core/src/Api/Actions/CreateAction.php
index 3b087f296..74638566a 100644
--- a/framework/core/src/Api/Actions/CreateAction.php
+++ b/framework/core/src/Api/Actions/CreateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/DeleteAction.php b/framework/core/src/Api/Actions/DeleteAction.php
index 7b8c09c2a..f460063c7 100644
--- a/framework/core/src/Api/Actions/DeleteAction.php
+++ b/framework/core/src/Api/Actions/DeleteAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Discussions/CreateAction.php b/framework/core/src/Api/Actions/Discussions/CreateAction.php
index 44d7bed7f..971805bf6 100644
--- a/framework/core/src/Api/Actions/Discussions/CreateAction.php
+++ b/framework/core/src/Api/Actions/Discussions/CreateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Discussions/DeleteAction.php b/framework/core/src/Api/Actions/Discussions/DeleteAction.php
index 2fc2b1be1..8f0afe9f8 100644
--- a/framework/core/src/Api/Actions/Discussions/DeleteAction.php
+++ b/framework/core/src/Api/Actions/Discussions/DeleteAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Discussions/IndexAction.php b/framework/core/src/Api/Actions/Discussions/IndexAction.php
index 6b7418550..c2c2f962a 100644
--- a/framework/core/src/Api/Actions/Discussions/IndexAction.php
+++ b/framework/core/src/Api/Actions/Discussions/IndexAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Discussions/ShowAction.php b/framework/core/src/Api/Actions/Discussions/ShowAction.php
index 99863ea3c..030f35d08 100644
--- a/framework/core/src/Api/Actions/Discussions/ShowAction.php
+++ b/framework/core/src/Api/Actions/Discussions/ShowAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Discussions/UpdateAction.php b/framework/core/src/Api/Actions/Discussions/UpdateAction.php
index e65bfc363..7f20e2282 100644
--- a/framework/core/src/Api/Actions/Discussions/UpdateAction.php
+++ b/framework/core/src/Api/Actions/Discussions/UpdateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Extensions/DeleteAction.php b/framework/core/src/Api/Actions/Extensions/DeleteAction.php
index 83c78ab87..0a7901e63 100644
--- a/framework/core/src/Api/Actions/Extensions/DeleteAction.php
+++ b/framework/core/src/Api/Actions/Extensions/DeleteAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Extensions/UpdateAction.php b/framework/core/src/Api/Actions/Extensions/UpdateAction.php
index 8b6cbb4e8..3a44dea15 100644
--- a/framework/core/src/Api/Actions/Extensions/UpdateAction.php
+++ b/framework/core/src/Api/Actions/Extensions/UpdateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/ForgotAction.php b/framework/core/src/Api/Actions/ForgotAction.php
index bebd11ef2..95e56f49b 100644
--- a/framework/core/src/Api/Actions/ForgotAction.php
+++ b/framework/core/src/Api/Actions/ForgotAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Forum/ShowAction.php b/framework/core/src/Api/Actions/Forum/ShowAction.php
index aa791b05e..3c4aab327 100644
--- a/framework/core/src/Api/Actions/Forum/ShowAction.php
+++ b/framework/core/src/Api/Actions/Forum/ShowAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Forum/UpdateAction.php b/framework/core/src/Api/Actions/Forum/UpdateAction.php
index 8fd302797..3e975d169 100644
--- a/framework/core/src/Api/Actions/Forum/UpdateAction.php
+++ b/framework/core/src/Api/Actions/Forum/UpdateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Groups/CreateAction.php b/framework/core/src/Api/Actions/Groups/CreateAction.php
index f848571c3..9b9b78f5a 100644
--- a/framework/core/src/Api/Actions/Groups/CreateAction.php
+++ b/framework/core/src/Api/Actions/Groups/CreateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Groups/DeleteAction.php b/framework/core/src/Api/Actions/Groups/DeleteAction.php
index 16f2ebe24..83ba9bde0 100644
--- a/framework/core/src/Api/Actions/Groups/DeleteAction.php
+++ b/framework/core/src/Api/Actions/Groups/DeleteAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Groups/IndexAction.php b/framework/core/src/Api/Actions/Groups/IndexAction.php
index d5d232674..39eadad9b 100644
--- a/framework/core/src/Api/Actions/Groups/IndexAction.php
+++ b/framework/core/src/Api/Actions/Groups/IndexAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Groups/UpdateAction.php b/framework/core/src/Api/Actions/Groups/UpdateAction.php
index 817674367..24692f690 100644
--- a/framework/core/src/Api/Actions/Groups/UpdateAction.php
+++ b/framework/core/src/Api/Actions/Groups/UpdateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/JsonApiAction.php b/framework/core/src/Api/Actions/JsonApiAction.php
index 581686521..09e54dcf4 100644
--- a/framework/core/src/Api/Actions/JsonApiAction.php
+++ b/framework/core/src/Api/Actions/JsonApiAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Notifications/IndexAction.php b/framework/core/src/Api/Actions/Notifications/IndexAction.php
index 1180e4ef7..ef9b48c8a 100644
--- a/framework/core/src/Api/Actions/Notifications/IndexAction.php
+++ b/framework/core/src/Api/Actions/Notifications/IndexAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Notifications/UpdateAction.php b/framework/core/src/Api/Actions/Notifications/UpdateAction.php
index 03330b945..2ec183a02 100644
--- a/framework/core/src/Api/Actions/Notifications/UpdateAction.php
+++ b/framework/core/src/Api/Actions/Notifications/UpdateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/PermissionAction.php b/framework/core/src/Api/Actions/PermissionAction.php
index c4cf4258b..2b951a0e7 100644
--- a/framework/core/src/Api/Actions/PermissionAction.php
+++ b/framework/core/src/Api/Actions/PermissionAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Posts/CreateAction.php b/framework/core/src/Api/Actions/Posts/CreateAction.php
index 8790e1d3b..f5b518981 100644
--- a/framework/core/src/Api/Actions/Posts/CreateAction.php
+++ b/framework/core/src/Api/Actions/Posts/CreateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Posts/DeleteAction.php b/framework/core/src/Api/Actions/Posts/DeleteAction.php
index c5dcf8d0e..a527404b2 100644
--- a/framework/core/src/Api/Actions/Posts/DeleteAction.php
+++ b/framework/core/src/Api/Actions/Posts/DeleteAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Posts/GetsPosts.php b/framework/core/src/Api/Actions/Posts/GetsPosts.php
index 4e69793f5..125a7a59f 100644
--- a/framework/core/src/Api/Actions/Posts/GetsPosts.php
+++ b/framework/core/src/Api/Actions/Posts/GetsPosts.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Posts/IndexAction.php b/framework/core/src/Api/Actions/Posts/IndexAction.php
index bee68c1a0..94f758eb7 100644
--- a/framework/core/src/Api/Actions/Posts/IndexAction.php
+++ b/framework/core/src/Api/Actions/Posts/IndexAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Posts/ShowAction.php b/framework/core/src/Api/Actions/Posts/ShowAction.php
index 7dd6c5f84..bab023e54 100644
--- a/framework/core/src/Api/Actions/Posts/ShowAction.php
+++ b/framework/core/src/Api/Actions/Posts/ShowAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Posts/UpdateAction.php b/framework/core/src/Api/Actions/Posts/UpdateAction.php
index f5444d6a1..c119b6ab5 100644
--- a/framework/core/src/Api/Actions/Posts/UpdateAction.php
+++ b/framework/core/src/Api/Actions/Posts/UpdateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/SerializeAction.php b/framework/core/src/Api/Actions/SerializeAction.php
index bc36aa47f..b60b98c45 100644
--- a/framework/core/src/Api/Actions/SerializeAction.php
+++ b/framework/core/src/Api/Actions/SerializeAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/SerializeCollectionAction.php b/framework/core/src/Api/Actions/SerializeCollectionAction.php
index df0deda98..110efb101 100644
--- a/framework/core/src/Api/Actions/SerializeCollectionAction.php
+++ b/framework/core/src/Api/Actions/SerializeCollectionAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/SerializeResourceAction.php b/framework/core/src/Api/Actions/SerializeResourceAction.php
index 9eecad74f..17b3d0620 100644
--- a/framework/core/src/Api/Actions/SerializeResourceAction.php
+++ b/framework/core/src/Api/Actions/SerializeResourceAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/TokenAction.php b/framework/core/src/Api/Actions/TokenAction.php
index 4fe3c308b..4dfeff869 100644
--- a/framework/core/src/Api/Actions/TokenAction.php
+++ b/framework/core/src/Api/Actions/TokenAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Users/CreateAction.php b/framework/core/src/Api/Actions/Users/CreateAction.php
index 3725d5b20..d88117f2f 100644
--- a/framework/core/src/Api/Actions/Users/CreateAction.php
+++ b/framework/core/src/Api/Actions/Users/CreateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Users/DeleteAction.php b/framework/core/src/Api/Actions/Users/DeleteAction.php
index 0fe2ceddb..26f1d10a3 100644
--- a/framework/core/src/Api/Actions/Users/DeleteAction.php
+++ b/framework/core/src/Api/Actions/Users/DeleteAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Users/DeleteAvatarAction.php b/framework/core/src/Api/Actions/Users/DeleteAvatarAction.php
index 2f7ac5d20..41055ceb1 100644
--- a/framework/core/src/Api/Actions/Users/DeleteAvatarAction.php
+++ b/framework/core/src/Api/Actions/Users/DeleteAvatarAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Users/IndexAction.php b/framework/core/src/Api/Actions/Users/IndexAction.php
index 9d9d59a93..4b433fc8f 100644
--- a/framework/core/src/Api/Actions/Users/IndexAction.php
+++ b/framework/core/src/Api/Actions/Users/IndexAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Users/ShowAction.php b/framework/core/src/Api/Actions/Users/ShowAction.php
index 4e675079b..4e56ca8e6 100644
--- a/framework/core/src/Api/Actions/Users/ShowAction.php
+++ b/framework/core/src/Api/Actions/Users/ShowAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Users/UpdateAction.php b/framework/core/src/Api/Actions/Users/UpdateAction.php
index 9c707702c..6dff45d80 100644
--- a/framework/core/src/Api/Actions/Users/UpdateAction.php
+++ b/framework/core/src/Api/Actions/Users/UpdateAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Actions/Users/UploadAvatarAction.php b/framework/core/src/Api/Actions/Users/UploadAvatarAction.php
index 696957430..e270bfaa0 100644
--- a/framework/core/src/Api/Actions/Users/UploadAvatarAction.php
+++ b/framework/core/src/Api/Actions/Users/UploadAvatarAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/ApiServiceProvider.php b/framework/core/src/Api/ApiServiceProvider.php
index f985abb0d..d40ba9b9f 100644
--- a/framework/core/src/Api/ApiServiceProvider.php
+++ b/framework/core/src/Api/ApiServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Client.php b/framework/core/src/Api/Client.php
index c8e855a6f..197e5e46a 100644
--- a/framework/core/src/Api/Client.php
+++ b/framework/core/src/Api/Client.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Commands/GenerateAccessToken.php b/framework/core/src/Api/Commands/GenerateAccessToken.php
index bbc092f4a..628efc48e 100644
--- a/framework/core/src/Api/Commands/GenerateAccessToken.php
+++ b/framework/core/src/Api/Commands/GenerateAccessToken.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Commands/GenerateAccessTokenHandler.php b/framework/core/src/Api/Commands/GenerateAccessTokenHandler.php
index 3b0e9b736..0f3534383 100644
--- a/framework/core/src/Api/Commands/GenerateAccessTokenHandler.php
+++ b/framework/core/src/Api/Commands/GenerateAccessTokenHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/JsonApiRequest.php b/framework/core/src/Api/JsonApiRequest.php
index 1f22712ff..10a96136e 100644
--- a/framework/core/src/Api/JsonApiRequest.php
+++ b/framework/core/src/Api/JsonApiRequest.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Middleware/JsonApiErrors.php b/framework/core/src/Api/Middleware/JsonApiErrors.php
index 94bb70b21..0b76a70a1 100644
--- a/framework/core/src/Api/Middleware/JsonApiErrors.php
+++ b/framework/core/src/Api/Middleware/JsonApiErrors.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Middleware/LoginWithHeader.php b/framework/core/src/Api/Middleware/LoginWithHeader.php
index f3d11562f..7eb890b0a 100644
--- a/framework/core/src/Api/Middleware/LoginWithHeader.php
+++ b/framework/core/src/Api/Middleware/LoginWithHeader.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Middleware/ReadJsonParameters.php b/framework/core/src/Api/Middleware/ReadJsonParameters.php
index 9f16835ca..088bac164 100644
--- a/framework/core/src/Api/Middleware/ReadJsonParameters.php
+++ b/framework/core/src/Api/Middleware/ReadJsonParameters.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Request.php b/framework/core/src/Api/Request.php
index 6c5ac7378..bb9b542a6 100644
--- a/framework/core/src/Api/Request.php
+++ b/framework/core/src/Api/Request.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Response.php b/framework/core/src/Api/Response.php
index 45b5b8ff3..5f7782806 100644
--- a/framework/core/src/Api/Response.php
+++ b/framework/core/src/Api/Response.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/ActivitySerializer.php b/framework/core/src/Api/Serializers/ActivitySerializer.php
index e13e2e881..bbf71b8d7 100644
--- a/framework/core/src/Api/Serializers/ActivitySerializer.php
+++ b/framework/core/src/Api/Serializers/ActivitySerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/CurrentUserSerializer.php b/framework/core/src/Api/Serializers/CurrentUserSerializer.php
index c542874b7..2a7e62d22 100644
--- a/framework/core/src/Api/Serializers/CurrentUserSerializer.php
+++ b/framework/core/src/Api/Serializers/CurrentUserSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/DiscussionBasicSerializer.php b/framework/core/src/Api/Serializers/DiscussionBasicSerializer.php
index c90839004..49b58d14d 100644
--- a/framework/core/src/Api/Serializers/DiscussionBasicSerializer.php
+++ b/framework/core/src/Api/Serializers/DiscussionBasicSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/DiscussionSerializer.php b/framework/core/src/Api/Serializers/DiscussionSerializer.php
index a398982f5..39af34ee8 100644
--- a/framework/core/src/Api/Serializers/DiscussionSerializer.php
+++ b/framework/core/src/Api/Serializers/DiscussionSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/ForumSerializer.php b/framework/core/src/Api/Serializers/ForumSerializer.php
index a77dd6a2a..61bfce741 100644
--- a/framework/core/src/Api/Serializers/ForumSerializer.php
+++ b/framework/core/src/Api/Serializers/ForumSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/GroupSerializer.php b/framework/core/src/Api/Serializers/GroupSerializer.php
index 0b8122c62..82d0bb5c2 100644
--- a/framework/core/src/Api/Serializers/GroupSerializer.php
+++ b/framework/core/src/Api/Serializers/GroupSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/NotificationSerializer.php b/framework/core/src/Api/Serializers/NotificationSerializer.php
index 598854026..2d38b5eee 100644
--- a/framework/core/src/Api/Serializers/NotificationSerializer.php
+++ b/framework/core/src/Api/Serializers/NotificationSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/PostBasicSerializer.php b/framework/core/src/Api/Serializers/PostBasicSerializer.php
index d7e0a090d..338750eb2 100644
--- a/framework/core/src/Api/Serializers/PostBasicSerializer.php
+++ b/framework/core/src/Api/Serializers/PostBasicSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/PostSerializer.php b/framework/core/src/Api/Serializers/PostSerializer.php
index 71e4da33c..fff2c0b97 100644
--- a/framework/core/src/Api/Serializers/PostSerializer.php
+++ b/framework/core/src/Api/Serializers/PostSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/Serializer.php b/framework/core/src/Api/Serializers/Serializer.php
index d7f6269e0..5ee57851d 100644
--- a/framework/core/src/Api/Serializers/Serializer.php
+++ b/framework/core/src/Api/Serializers/Serializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/UserBasicSerializer.php b/framework/core/src/Api/Serializers/UserBasicSerializer.php
index a58accc82..ddb94944d 100644
--- a/framework/core/src/Api/Serializers/UserBasicSerializer.php
+++ b/framework/core/src/Api/Serializers/UserBasicSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Api/Serializers/UserSerializer.php b/framework/core/src/Api/Serializers/UserSerializer.php
index 00f6a8df6..ec5258efb 100644
--- a/framework/core/src/Api/Serializers/UserSerializer.php
+++ b/framework/core/src/Api/Serializers/UserSerializer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Assets/AssetManager.php b/framework/core/src/Assets/AssetManager.php
index 65cfb94a8..916ae8294 100644
--- a/framework/core/src/Assets/AssetManager.php
+++ b/framework/core/src/Assets/AssetManager.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Assets/Compiler.php b/framework/core/src/Assets/Compiler.php
index fc13137ba..e0d597746 100644
--- a/framework/core/src/Assets/Compiler.php
+++ b/framework/core/src/Assets/Compiler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Assets/JsCompiler.php b/framework/core/src/Assets/JsCompiler.php
index de0d0678c..df32f1862 100644
--- a/framework/core/src/Assets/JsCompiler.php
+++ b/framework/core/src/Assets/JsCompiler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Assets/LessCompiler.php b/framework/core/src/Assets/LessCompiler.php
index 5bac231e7..c0c6ffd06 100644
--- a/framework/core/src/Assets/LessCompiler.php
+++ b/framework/core/src/Assets/LessCompiler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Assets/RevisionCompiler.php b/framework/core/src/Assets/RevisionCompiler.php
index f9d4f1cae..546205093 100644
--- a/framework/core/src/Assets/RevisionCompiler.php
+++ b/framework/core/src/Assets/RevisionCompiler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Console/Command.php b/framework/core/src/Console/Command.php
index 7ecbcd5c8..84eb63d09 100644
--- a/framework/core/src/Console/Command.php
+++ b/framework/core/src/Console/Command.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Console/GenerateExtensionCommand.php b/framework/core/src/Console/GenerateExtensionCommand.php
index 6bbb6e283..f11174338 100644
--- a/framework/core/src/Console/GenerateExtensionCommand.php
+++ b/framework/core/src/Console/GenerateExtensionCommand.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Console/ImportCommand.php b/framework/core/src/Console/ImportCommand.php
index 3e731195e..14d367f46 100644
--- a/framework/core/src/Console/ImportCommand.php
+++ b/framework/core/src/Console/ImportCommand.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Console/UpgradeCommand.php b/framework/core/src/Console/UpgradeCommand.php
index 42397fada..b8a80f21e 100644
--- a/framework/core/src/Console/UpgradeCommand.php
+++ b/framework/core/src/Console/UpgradeCommand.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core.php b/framework/core/src/Core.php
index 4985b756b..abb4d3c85 100644
--- a/framework/core/src/Core.php
+++ b/framework/core/src/Core.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Application.php b/framework/core/src/Core/Application.php
index 75734b3a8..2720ea04a 100644
--- a/framework/core/src/Core/Application.php
+++ b/framework/core/src/Core/Application.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
@@ -215,7 +215,8 @@ class Application extends Container implements ApplicationContract
     public function afterLoadingEnvironment(Closure $callback)
     {
         return $this->afterBootstrapping(
-            'Illuminate\Foundation\Bootstrap\DetectEnvironment', $callback
+            'Illuminate\Foundation\Bootstrap\DetectEnvironment',
+            $callback
         );
     }
 
diff --git a/framework/core/src/Core/CoreServiceProvider.php b/framework/core/src/Core/CoreServiceProvider.php
index 8ea16c4b6..9a95a552d 100644
--- a/framework/core/src/Core/CoreServiceProvider.php
+++ b/framework/core/src/Core/CoreServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/DatabaseServiceProvider.php b/framework/core/src/Core/DatabaseServiceProvider.php
index 74df4c61f..571fb4a25 100644
--- a/framework/core/src/Core/DatabaseServiceProvider.php
+++ b/framework/core/src/Core/DatabaseServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Commands/DeleteDiscussion.php b/framework/core/src/Core/Discussions/Commands/DeleteDiscussion.php
index 6bee5f531..25b41ab68 100644
--- a/framework/core/src/Core/Discussions/Commands/DeleteDiscussion.php
+++ b/framework/core/src/Core/Discussions/Commands/DeleteDiscussion.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Commands/DeleteDiscussionHandler.php b/framework/core/src/Core/Discussions/Commands/DeleteDiscussionHandler.php
index 601e89426..82d795489 100644
--- a/framework/core/src/Core/Discussions/Commands/DeleteDiscussionHandler.php
+++ b/framework/core/src/Core/Discussions/Commands/DeleteDiscussionHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Commands/EditDiscussion.php b/framework/core/src/Core/Discussions/Commands/EditDiscussion.php
index 268e39e11..c744c3a1b 100644
--- a/framework/core/src/Core/Discussions/Commands/EditDiscussion.php
+++ b/framework/core/src/Core/Discussions/Commands/EditDiscussion.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Commands/EditDiscussionHandler.php b/framework/core/src/Core/Discussions/Commands/EditDiscussionHandler.php
index e83a42095..c1a600b79 100644
--- a/framework/core/src/Core/Discussions/Commands/EditDiscussionHandler.php
+++ b/framework/core/src/Core/Discussions/Commands/EditDiscussionHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Commands/ReadDiscussion.php b/framework/core/src/Core/Discussions/Commands/ReadDiscussion.php
index b5c2494b4..bf2aaa539 100644
--- a/framework/core/src/Core/Discussions/Commands/ReadDiscussion.php
+++ b/framework/core/src/Core/Discussions/Commands/ReadDiscussion.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Commands/ReadDiscussionHandler.php b/framework/core/src/Core/Discussions/Commands/ReadDiscussionHandler.php
index 58618ebc1..1eac291d3 100644
--- a/framework/core/src/Core/Discussions/Commands/ReadDiscussionHandler.php
+++ b/framework/core/src/Core/Discussions/Commands/ReadDiscussionHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Commands/StartDiscussion.php b/framework/core/src/Core/Discussions/Commands/StartDiscussion.php
index c77ccb7b6..eada86799 100644
--- a/framework/core/src/Core/Discussions/Commands/StartDiscussion.php
+++ b/framework/core/src/Core/Discussions/Commands/StartDiscussion.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Commands/StartDiscussionHandler.php b/framework/core/src/Core/Discussions/Commands/StartDiscussionHandler.php
index 5d4b29c97..d4bb6195c 100644
--- a/framework/core/src/Core/Discussions/Commands/StartDiscussionHandler.php
+++ b/framework/core/src/Core/Discussions/Commands/StartDiscussionHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Discussion.php b/framework/core/src/Core/Discussions/Discussion.php
index 1d50054ec..f3984ccea 100755
--- a/framework/core/src/Core/Discussions/Discussion.php
+++ b/framework/core/src/Core/Discussions/Discussion.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/DiscussionRepository.php b/framework/core/src/Core/Discussions/DiscussionRepository.php
index 4a22aebc0..dec93c24a 100644
--- a/framework/core/src/Core/Discussions/DiscussionRepository.php
+++ b/framework/core/src/Core/Discussions/DiscussionRepository.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/DiscussionState.php b/framework/core/src/Core/Discussions/DiscussionState.php
index e7d7c0a73..5164b4b14 100644
--- a/framework/core/src/Core/Discussions/DiscussionState.php
+++ b/framework/core/src/Core/Discussions/DiscussionState.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/DiscussionsServiceProvider.php b/framework/core/src/Core/Discussions/DiscussionsServiceProvider.php
index 57f468dd0..d128eefab 100644
--- a/framework/core/src/Core/Discussions/DiscussionsServiceProvider.php
+++ b/framework/core/src/Core/Discussions/DiscussionsServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Listeners/DiscussionMetadataUpdater.php b/framework/core/src/Core/Discussions/Listeners/DiscussionMetadataUpdater.php
index 8d63a7e12..a35684c3f 100755
--- a/framework/core/src/Core/Discussions/Listeners/DiscussionMetadataUpdater.php
+++ b/framework/core/src/Core/Discussions/Listeners/DiscussionMetadataUpdater.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Search/DiscussionSearch.php b/framework/core/src/Core/Discussions/Search/DiscussionSearch.php
index 5d7119278..0283bc555 100644
--- a/framework/core/src/Core/Discussions/Search/DiscussionSearch.php
+++ b/framework/core/src/Core/Discussions/Search/DiscussionSearch.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Search/DiscussionSearcher.php b/framework/core/src/Core/Discussions/Search/DiscussionSearcher.php
index 94eb4513e..a80d13484 100644
--- a/framework/core/src/Core/Discussions/Search/DiscussionSearcher.php
+++ b/framework/core/src/Core/Discussions/Search/DiscussionSearcher.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Search/Fulltext/Driver.php b/framework/core/src/Core/Discussions/Search/Fulltext/Driver.php
index 0ac2d00cd..2dbf0e50e 100644
--- a/framework/core/src/Core/Discussions/Search/Fulltext/Driver.php
+++ b/framework/core/src/Core/Discussions/Search/Fulltext/Driver.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Search/Fulltext/MySqlFulltextDriver.php b/framework/core/src/Core/Discussions/Search/Fulltext/MySqlFulltextDriver.php
index e4782b77c..b4a522577 100644
--- a/framework/core/src/Core/Discussions/Search/Fulltext/MySqlFulltextDriver.php
+++ b/framework/core/src/Core/Discussions/Search/Fulltext/MySqlFulltextDriver.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Search/Gambits/AuthorGambit.php b/framework/core/src/Core/Discussions/Search/Gambits/AuthorGambit.php
index 41b6f0127..f6d0ee97b 100644
--- a/framework/core/src/Core/Discussions/Search/Gambits/AuthorGambit.php
+++ b/framework/core/src/Core/Discussions/Search/Gambits/AuthorGambit.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Search/Gambits/FulltextGambit.php b/framework/core/src/Core/Discussions/Search/Gambits/FulltextGambit.php
index 6539188fa..758f6620d 100644
--- a/framework/core/src/Core/Discussions/Search/Gambits/FulltextGambit.php
+++ b/framework/core/src/Core/Discussions/Search/Gambits/FulltextGambit.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Discussions/Search/Gambits/UnreadGambit.php b/framework/core/src/Core/Discussions/Search/Gambits/UnreadGambit.php
index 08dd3a666..634eb1fb6 100644
--- a/framework/core/src/Core/Discussions/Search/Gambits/UnreadGambit.php
+++ b/framework/core/src/Core/Discussions/Search/Gambits/UnreadGambit.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Exceptions/InvalidConfirmationTokenException.php b/framework/core/src/Core/Exceptions/InvalidConfirmationTokenException.php
index b7389f1da..22ebed2b8 100644
--- a/framework/core/src/Core/Exceptions/InvalidConfirmationTokenException.php
+++ b/framework/core/src/Core/Exceptions/InvalidConfirmationTokenException.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Exceptions/PermissionDeniedException.php b/framework/core/src/Core/Exceptions/PermissionDeniedException.php
index 815237d7c..14b7c1d66 100644
--- a/framework/core/src/Core/Exceptions/PermissionDeniedException.php
+++ b/framework/core/src/Core/Exceptions/PermissionDeniedException.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Exceptions/ValidationException.php b/framework/core/src/Core/Exceptions/ValidationException.php
index 61614d20a..56ff781a9 100644
--- a/framework/core/src/Core/Exceptions/ValidationException.php
+++ b/framework/core/src/Core/Exceptions/ValidationException.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Formatter/Formatter.php b/framework/core/src/Core/Formatter/Formatter.php
index 9ffaaf3b4..6ad6798fd 100644
--- a/framework/core/src/Core/Formatter/Formatter.php
+++ b/framework/core/src/Core/Formatter/Formatter.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Formatter/FormatterServiceProvider.php b/framework/core/src/Core/Formatter/FormatterServiceProvider.php
index dbf720ac2..ca8e8d555 100644
--- a/framework/core/src/Core/Formatter/FormatterServiceProvider.php
+++ b/framework/core/src/Core/Formatter/FormatterServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Forum.php b/framework/core/src/Core/Forum.php
index 274a756e1..339e8d398 100755
--- a/framework/core/src/Core/Forum.php
+++ b/framework/core/src/Core/Forum.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/Commands/CreateGroup.php b/framework/core/src/Core/Groups/Commands/CreateGroup.php
index b4977bb13..704fa73d1 100644
--- a/framework/core/src/Core/Groups/Commands/CreateGroup.php
+++ b/framework/core/src/Core/Groups/Commands/CreateGroup.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/Commands/CreateGroupHandler.php b/framework/core/src/Core/Groups/Commands/CreateGroupHandler.php
index 80e4e2e8d..0490eada9 100644
--- a/framework/core/src/Core/Groups/Commands/CreateGroupHandler.php
+++ b/framework/core/src/Core/Groups/Commands/CreateGroupHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/Commands/DeleteGroup.php b/framework/core/src/Core/Groups/Commands/DeleteGroup.php
index 8c0b6ffc1..6f6a56873 100644
--- a/framework/core/src/Core/Groups/Commands/DeleteGroup.php
+++ b/framework/core/src/Core/Groups/Commands/DeleteGroup.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/Commands/DeleteGroupHandler.php b/framework/core/src/Core/Groups/Commands/DeleteGroupHandler.php
index cbdca959d..79900471f 100644
--- a/framework/core/src/Core/Groups/Commands/DeleteGroupHandler.php
+++ b/framework/core/src/Core/Groups/Commands/DeleteGroupHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/Commands/EditGroup.php b/framework/core/src/Core/Groups/Commands/EditGroup.php
index 62e0408c0..f54c9ff77 100644
--- a/framework/core/src/Core/Groups/Commands/EditGroup.php
+++ b/framework/core/src/Core/Groups/Commands/EditGroup.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/Commands/EditGroupHandler.php b/framework/core/src/Core/Groups/Commands/EditGroupHandler.php
index 016715134..cb6f5384c 100644
--- a/framework/core/src/Core/Groups/Commands/EditGroupHandler.php
+++ b/framework/core/src/Core/Groups/Commands/EditGroupHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/Group.php b/framework/core/src/Core/Groups/Group.php
index d5483f511..8825ee4f6 100755
--- a/framework/core/src/Core/Groups/Group.php
+++ b/framework/core/src/Core/Groups/Group.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/GroupRepository.php b/framework/core/src/Core/Groups/GroupRepository.php
index 4d9f37038..30a26d2c2 100644
--- a/framework/core/src/Core/Groups/GroupRepository.php
+++ b/framework/core/src/Core/Groups/GroupRepository.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/GroupsServiceProvider.php b/framework/core/src/Core/Groups/GroupsServiceProvider.php
index f330b4326..4b2513e64 100644
--- a/framework/core/src/Core/Groups/GroupsServiceProvider.php
+++ b/framework/core/src/Core/Groups/GroupsServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Groups/Permission.php b/framework/core/src/Core/Groups/Permission.php
index a087a710e..85e8d024e 100755
--- a/framework/core/src/Core/Groups/Permission.php
+++ b/framework/core/src/Core/Groups/Permission.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Model.php b/framework/core/src/Core/Model.php
index 78575d592..27315a65b 100755
--- a/framework/core/src/Core/Model.php
+++ b/framework/core/src/Core/Model.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/Blueprint.php b/framework/core/src/Core/Notifications/Blueprint.php
index 77c450d0b..164123a30 100644
--- a/framework/core/src/Core/Notifications/Blueprint.php
+++ b/framework/core/src/Core/Notifications/Blueprint.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/Commands/ReadNotification.php b/framework/core/src/Core/Notifications/Commands/ReadNotification.php
index 35e8b5efe..ca39849c1 100644
--- a/framework/core/src/Core/Notifications/Commands/ReadNotification.php
+++ b/framework/core/src/Core/Notifications/Commands/ReadNotification.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/Commands/ReadNotificationHandler.php b/framework/core/src/Core/Notifications/Commands/ReadNotificationHandler.php
index 0753acf9c..74038e030 100644
--- a/framework/core/src/Core/Notifications/Commands/ReadNotificationHandler.php
+++ b/framework/core/src/Core/Notifications/Commands/ReadNotificationHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/DiscussionRenamedBlueprint.php b/framework/core/src/Core/Notifications/DiscussionRenamedBlueprint.php
index cbf4feae8..f0a189d94 100644
--- a/framework/core/src/Core/Notifications/DiscussionRenamedBlueprint.php
+++ b/framework/core/src/Core/Notifications/DiscussionRenamedBlueprint.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/Listeners/DiscussionRenamedNotifier.php b/framework/core/src/Core/Notifications/Listeners/DiscussionRenamedNotifier.php
index 58472dfe4..411d96c98 100755
--- a/framework/core/src/Core/Notifications/Listeners/DiscussionRenamedNotifier.php
+++ b/framework/core/src/Core/Notifications/Listeners/DiscussionRenamedNotifier.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/MailableBlueprint.php b/framework/core/src/Core/Notifications/MailableBlueprint.php
index eaf2398e6..fad0eb249 100644
--- a/framework/core/src/Core/Notifications/MailableBlueprint.php
+++ b/framework/core/src/Core/Notifications/MailableBlueprint.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/Notification.php b/framework/core/src/Core/Notifications/Notification.php
index 430329a0c..2d6397f05 100644
--- a/framework/core/src/Core/Notifications/Notification.php
+++ b/framework/core/src/Core/Notifications/Notification.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/NotificationMailer.php b/framework/core/src/Core/Notifications/NotificationMailer.php
index a8e154188..973ca9dab 100644
--- a/framework/core/src/Core/Notifications/NotificationMailer.php
+++ b/framework/core/src/Core/Notifications/NotificationMailer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/NotificationRepository.php b/framework/core/src/Core/Notifications/NotificationRepository.php
index 7404ded26..bad0f2e26 100644
--- a/framework/core/src/Core/Notifications/NotificationRepository.php
+++ b/framework/core/src/Core/Notifications/NotificationRepository.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/NotificationSyncer.php b/framework/core/src/Core/Notifications/NotificationSyncer.php
index ba187e1d4..527deab2f 100644
--- a/framework/core/src/Core/Notifications/NotificationSyncer.php
+++ b/framework/core/src/Core/Notifications/NotificationSyncer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Notifications/NotificationsServiceProvider.php b/framework/core/src/Core/Notifications/NotificationsServiceProvider.php
index b79b3a84c..6f4ccfd9c 100644
--- a/framework/core/src/Core/Notifications/NotificationsServiceProvider.php
+++ b/framework/core/src/Core/Notifications/NotificationsServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/Commands/DeletePost.php b/framework/core/src/Core/Posts/Commands/DeletePost.php
index 12db5b049..09d2a155f 100644
--- a/framework/core/src/Core/Posts/Commands/DeletePost.php
+++ b/framework/core/src/Core/Posts/Commands/DeletePost.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/Commands/DeletePostHandler.php b/framework/core/src/Core/Posts/Commands/DeletePostHandler.php
index 749e77a37..9ee848045 100644
--- a/framework/core/src/Core/Posts/Commands/DeletePostHandler.php
+++ b/framework/core/src/Core/Posts/Commands/DeletePostHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/Commands/EditPost.php b/framework/core/src/Core/Posts/Commands/EditPost.php
index d065548f3..9fdab8448 100644
--- a/framework/core/src/Core/Posts/Commands/EditPost.php
+++ b/framework/core/src/Core/Posts/Commands/EditPost.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/Commands/EditPostHandler.php b/framework/core/src/Core/Posts/Commands/EditPostHandler.php
index b167ab773..06c192eff 100644
--- a/framework/core/src/Core/Posts/Commands/EditPostHandler.php
+++ b/framework/core/src/Core/Posts/Commands/EditPostHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/Commands/PostReply.php b/framework/core/src/Core/Posts/Commands/PostReply.php
index 45add6801..c93d299b6 100644
--- a/framework/core/src/Core/Posts/Commands/PostReply.php
+++ b/framework/core/src/Core/Posts/Commands/PostReply.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/Commands/PostReplyHandler.php b/framework/core/src/Core/Posts/Commands/PostReplyHandler.php
index 91a263603..dc085740d 100644
--- a/framework/core/src/Core/Posts/Commands/PostReplyHandler.php
+++ b/framework/core/src/Core/Posts/Commands/PostReplyHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/CommentPost.php b/framework/core/src/Core/Posts/CommentPost.php
index 85b3253a5..eb55b6cec 100755
--- a/framework/core/src/Core/Posts/CommentPost.php
+++ b/framework/core/src/Core/Posts/CommentPost.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/DiscussionRenamedPost.php b/framework/core/src/Core/Posts/DiscussionRenamedPost.php
index c10e3dc22..78c761f15 100755
--- a/framework/core/src/Core/Posts/DiscussionRenamedPost.php
+++ b/framework/core/src/Core/Posts/DiscussionRenamedPost.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/EventPost.php b/framework/core/src/Core/Posts/EventPost.php
index d177a3724..c6a8acc75 100755
--- a/framework/core/src/Core/Posts/EventPost.php
+++ b/framework/core/src/Core/Posts/EventPost.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/MergeablePost.php b/framework/core/src/Core/Posts/MergeablePost.php
index fa56d0443..bfc821135 100644
--- a/framework/core/src/Core/Posts/MergeablePost.php
+++ b/framework/core/src/Core/Posts/MergeablePost.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/Post.php b/framework/core/src/Core/Posts/Post.php
index 8f3898c67..4c606de52 100755
--- a/framework/core/src/Core/Posts/Post.php
+++ b/framework/core/src/Core/Posts/Post.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/PostRepository.php b/framework/core/src/Core/Posts/PostRepository.php
index 66eeae74a..59ec81de7 100644
--- a/framework/core/src/Core/Posts/PostRepository.php
+++ b/framework/core/src/Core/Posts/PostRepository.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/PostsServiceProvider.php b/framework/core/src/Core/Posts/PostsServiceProvider.php
index bfaf903f4..d55ccdc67 100644
--- a/framework/core/src/Core/Posts/PostsServiceProvider.php
+++ b/framework/core/src/Core/Posts/PostsServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Posts/RegisteredTypesScope.php b/framework/core/src/Core/Posts/RegisteredTypesScope.php
index 135788654..6de5b1d13 100644
--- a/framework/core/src/Core/Posts/RegisteredTypesScope.php
+++ b/framework/core/src/Core/Posts/RegisteredTypesScope.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Search/AppliesParametersToSearch.php b/framework/core/src/Core/Search/AppliesParametersToSearch.php
index 9f75e5a82..993e4531f 100644
--- a/framework/core/src/Core/Search/AppliesParametersToSearch.php
+++ b/framework/core/src/Core/Search/AppliesParametersToSearch.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Search/Gambit.php b/framework/core/src/Core/Search/Gambit.php
index b6946284d..95223dbbf 100644
--- a/framework/core/src/Core/Search/Gambit.php
+++ b/framework/core/src/Core/Search/Gambit.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Search/GambitManager.php b/framework/core/src/Core/Search/GambitManager.php
index bb782d0cf..06a735875 100644
--- a/framework/core/src/Core/Search/GambitManager.php
+++ b/framework/core/src/Core/Search/GambitManager.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Search/RegexGambit.php b/framework/core/src/Core/Search/RegexGambit.php
index 244d4643b..70a1c0c4e 100644
--- a/framework/core/src/Core/Search/RegexGambit.php
+++ b/framework/core/src/Core/Search/RegexGambit.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Search/Search.php b/framework/core/src/Core/Search/Search.php
index 3f21cd932..e2d19118e 100644
--- a/framework/core/src/Core/Search/Search.php
+++ b/framework/core/src/Core/Search/Search.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Search/SearchCriteria.php b/framework/core/src/Core/Search/SearchCriteria.php
index bb0b6e98b..6a0c17233 100644
--- a/framework/core/src/Core/Search/SearchCriteria.php
+++ b/framework/core/src/Core/Search/SearchCriteria.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Search/SearchResults.php b/framework/core/src/Core/Search/SearchResults.php
index 3d4a29437..02069211b 100644
--- a/framework/core/src/Core/Search/SearchResults.php
+++ b/framework/core/src/Core/Search/SearchResults.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Settings/SettingsServiceProvider.php b/framework/core/src/Core/Settings/SettingsServiceProvider.php
index c9f104543..f1493590a 100644
--- a/framework/core/src/Core/Settings/SettingsServiceProvider.php
+++ b/framework/core/src/Core/Settings/SettingsServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Support/DispatchesEvents.php b/framework/core/src/Core/Support/DispatchesEvents.php
index 841779cd8..f45bb1a10 100644
--- a/framework/core/src/Core/Support/DispatchesEvents.php
+++ b/framework/core/src/Core/Support/DispatchesEvents.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Support/EventGenerator.php b/framework/core/src/Core/Support/EventGenerator.php
index 1d0ec3427..cd193e12b 100644
--- a/framework/core/src/Core/Support/EventGenerator.php
+++ b/framework/core/src/Core/Support/EventGenerator.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Support/Locked.php b/framework/core/src/Core/Support/Locked.php
index 42fab536f..0307168cb 100644
--- a/framework/core/src/Core/Support/Locked.php
+++ b/framework/core/src/Core/Support/Locked.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Support/ValidatesBeforeSave.php b/framework/core/src/Core/Support/ValidatesBeforeSave.php
index 61e7d4813..408a754d7 100644
--- a/framework/core/src/Core/Support/ValidatesBeforeSave.php
+++ b/framework/core/src/Core/Support/ValidatesBeforeSave.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Support/VisibleScope.php b/framework/core/src/Core/Support/VisibleScope.php
index 52c9c39e8..791c383a9 100644
--- a/framework/core/src/Core/Support/VisibleScope.php
+++ b/framework/core/src/Core/Support/VisibleScope.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/ConfirmEmail.php b/framework/core/src/Core/Users/Commands/ConfirmEmail.php
index 8c3975b26..187c04bf3 100644
--- a/framework/core/src/Core/Users/Commands/ConfirmEmail.php
+++ b/framework/core/src/Core/Users/Commands/ConfirmEmail.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/ConfirmEmailHandler.php b/framework/core/src/Core/Users/Commands/ConfirmEmailHandler.php
index d1eb38622..71f766915 100644
--- a/framework/core/src/Core/Users/Commands/ConfirmEmailHandler.php
+++ b/framework/core/src/Core/Users/Commands/ConfirmEmailHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/DeleteAvatar.php b/framework/core/src/Core/Users/Commands/DeleteAvatar.php
index f581cba29..e11ff87ea 100644
--- a/framework/core/src/Core/Users/Commands/DeleteAvatar.php
+++ b/framework/core/src/Core/Users/Commands/DeleteAvatar.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/DeleteAvatarHandler.php b/framework/core/src/Core/Users/Commands/DeleteAvatarHandler.php
index d900f38fc..7a53ab903 100644
--- a/framework/core/src/Core/Users/Commands/DeleteAvatarHandler.php
+++ b/framework/core/src/Core/Users/Commands/DeleteAvatarHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/DeleteUser.php b/framework/core/src/Core/Users/Commands/DeleteUser.php
index 260d4d1e4..c771cf227 100644
--- a/framework/core/src/Core/Users/Commands/DeleteUser.php
+++ b/framework/core/src/Core/Users/Commands/DeleteUser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/DeleteUserHandler.php b/framework/core/src/Core/Users/Commands/DeleteUserHandler.php
index 62b6fd2ff..b925101d3 100644
--- a/framework/core/src/Core/Users/Commands/DeleteUserHandler.php
+++ b/framework/core/src/Core/Users/Commands/DeleteUserHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/EditUser.php b/framework/core/src/Core/Users/Commands/EditUser.php
index 56ea652d8..cc0e63f41 100644
--- a/framework/core/src/Core/Users/Commands/EditUser.php
+++ b/framework/core/src/Core/Users/Commands/EditUser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/EditUserHandler.php b/framework/core/src/Core/Users/Commands/EditUserHandler.php
index a000b236f..e4f66ec4a 100644
--- a/framework/core/src/Core/Users/Commands/EditUserHandler.php
+++ b/framework/core/src/Core/Users/Commands/EditUserHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/RegisterUser.php b/framework/core/src/Core/Users/Commands/RegisterUser.php
index afe16925d..659b69e34 100644
--- a/framework/core/src/Core/Users/Commands/RegisterUser.php
+++ b/framework/core/src/Core/Users/Commands/RegisterUser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/RegisterUserHandler.php b/framework/core/src/Core/Users/Commands/RegisterUserHandler.php
index 60e7e5b2f..af8dbeeb2 100644
--- a/framework/core/src/Core/Users/Commands/RegisterUserHandler.php
+++ b/framework/core/src/Core/Users/Commands/RegisterUserHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/RequestPasswordReset.php b/framework/core/src/Core/Users/Commands/RequestPasswordReset.php
index 6b64c6598..15fc874b4 100644
--- a/framework/core/src/Core/Users/Commands/RequestPasswordReset.php
+++ b/framework/core/src/Core/Users/Commands/RequestPasswordReset.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/RequestPasswordResetHandler.php b/framework/core/src/Core/Users/Commands/RequestPasswordResetHandler.php
index 505885734..3f36f06ad 100644
--- a/framework/core/src/Core/Users/Commands/RequestPasswordResetHandler.php
+++ b/framework/core/src/Core/Users/Commands/RequestPasswordResetHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/UploadAvatar.php b/framework/core/src/Core/Users/Commands/UploadAvatar.php
index 4736f184f..0fed0d87c 100644
--- a/framework/core/src/Core/Users/Commands/UploadAvatar.php
+++ b/framework/core/src/Core/Users/Commands/UploadAvatar.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Commands/UploadAvatarHandler.php b/framework/core/src/Core/Users/Commands/UploadAvatarHandler.php
index 55e015c7a..1563cb1c3 100644
--- a/framework/core/src/Core/Users/Commands/UploadAvatarHandler.php
+++ b/framework/core/src/Core/Users/Commands/UploadAvatarHandler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/EmailToken.php b/framework/core/src/Core/Users/EmailToken.php
index c95e0c7bc..92acd1bc9 100644
--- a/framework/core/src/Core/Users/EmailToken.php
+++ b/framework/core/src/Core/Users/EmailToken.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Guest.php b/framework/core/src/Core/Users/Guest.php
index be2f0d89f..dcdc5763f 100755
--- a/framework/core/src/Core/Users/Guest.php
+++ b/framework/core/src/Core/Users/Guest.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Listeners/EmailConfirmationMailer.php b/framework/core/src/Core/Users/Listeners/EmailConfirmationMailer.php
index 7e94f4f7f..497285e3a 100755
--- a/framework/core/src/Core/Users/Listeners/EmailConfirmationMailer.php
+++ b/framework/core/src/Core/Users/Listeners/EmailConfirmationMailer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Listeners/UserMetadataUpdater.php b/framework/core/src/Core/Users/Listeners/UserMetadataUpdater.php
index 6b61587b2..5d070c741 100755
--- a/framework/core/src/Core/Users/Listeners/UserMetadataUpdater.php
+++ b/framework/core/src/Core/Users/Listeners/UserMetadataUpdater.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/PasswordToken.php b/framework/core/src/Core/Users/PasswordToken.php
index 23549b8cf..cee792d05 100644
--- a/framework/core/src/Core/Users/PasswordToken.php
+++ b/framework/core/src/Core/Users/PasswordToken.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Permission.php b/framework/core/src/Core/Users/Permission.php
index e6a1970db..ace9d8bdf 100644
--- a/framework/core/src/Core/Users/Permission.php
+++ b/framework/core/src/Core/Users/Permission.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Search/Gambits/FulltextGambit.php b/framework/core/src/Core/Users/Search/Gambits/FulltextGambit.php
index 5cc37dd3e..e7394e029 100644
--- a/framework/core/src/Core/Users/Search/Gambits/FulltextGambit.php
+++ b/framework/core/src/Core/Users/Search/Gambits/FulltextGambit.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Search/UserSearch.php b/framework/core/src/Core/Users/Search/UserSearch.php
index a91d34529..13276acbb 100644
--- a/framework/core/src/Core/Users/Search/UserSearch.php
+++ b/framework/core/src/Core/Users/Search/UserSearch.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/Search/UserSearcher.php b/framework/core/src/Core/Users/Search/UserSearcher.php
index 367b770c6..6da9a88cb 100644
--- a/framework/core/src/Core/Users/Search/UserSearcher.php
+++ b/framework/core/src/Core/Users/Search/UserSearcher.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/User.php b/framework/core/src/Core/Users/User.php
index c948194cf..2265f45f4 100755
--- a/framework/core/src/Core/Users/User.php
+++ b/framework/core/src/Core/Users/User.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/UserRepository.php b/framework/core/src/Core/Users/UserRepository.php
index 96359329a..a494c8dba 100644
--- a/framework/core/src/Core/Users/UserRepository.php
+++ b/framework/core/src/Core/Users/UserRepository.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Core/Users/UsersServiceProvider.php b/framework/core/src/Core/Users/UsersServiceProvider.php
index 77d8fa2f6..0e6f2a411 100644
--- a/framework/core/src/Core/Users/UsersServiceProvider.php
+++ b/framework/core/src/Core/Users/UsersServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/ApiAttributes.php b/framework/core/src/Events/ApiAttributes.php
index 5941c503e..cf9078f48 100644
--- a/framework/core/src/Events/ApiAttributes.php
+++ b/framework/core/src/Events/ApiAttributes.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/ApiRelationship.php b/framework/core/src/Events/ApiRelationship.php
index 4eef33b3e..f6a866cee 100644
--- a/framework/core/src/Events/ApiRelationship.php
+++ b/framework/core/src/Events/ApiRelationship.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/AvatarWillBeDeleted.php b/framework/core/src/Events/AvatarWillBeDeleted.php
index db7b9d848..1e9d9d3f8 100644
--- a/framework/core/src/Events/AvatarWillBeDeleted.php
+++ b/framework/core/src/Events/AvatarWillBeDeleted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/AvatarWillBeSaved.php b/framework/core/src/Events/AvatarWillBeSaved.php
index 057863484..5a326daef 100644
--- a/framework/core/src/Events/AvatarWillBeSaved.php
+++ b/framework/core/src/Events/AvatarWillBeSaved.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/BuildApiAction.php b/framework/core/src/Events/BuildApiAction.php
index 5a7eabff3..1dcf76d05 100644
--- a/framework/core/src/Events/BuildApiAction.php
+++ b/framework/core/src/Events/BuildApiAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/BuildClientView.php b/framework/core/src/Events/BuildClientView.php
index 9ec9de45a..1351bd23c 100644
--- a/framework/core/src/Events/BuildClientView.php
+++ b/framework/core/src/Events/BuildClientView.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/DiscussionSearchWillBePerformed.php b/framework/core/src/Events/DiscussionSearchWillBePerformed.php
index 5bb5e64aa..bc6677d42 100644
--- a/framework/core/src/Events/DiscussionSearchWillBePerformed.php
+++ b/framework/core/src/Events/DiscussionSearchWillBePerformed.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/DiscussionStateWillBeSaved.php b/framework/core/src/Events/DiscussionStateWillBeSaved.php
index 0aee34f2e..8f0ffdecf 100644
--- a/framework/core/src/Events/DiscussionStateWillBeSaved.php
+++ b/framework/core/src/Events/DiscussionStateWillBeSaved.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/DiscussionWasDeleted.php b/framework/core/src/Events/DiscussionWasDeleted.php
index 3658a5f2c..492fa4509 100644
--- a/framework/core/src/Events/DiscussionWasDeleted.php
+++ b/framework/core/src/Events/DiscussionWasDeleted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/DiscussionWasRead.php b/framework/core/src/Events/DiscussionWasRead.php
index d93520567..304595ac6 100644
--- a/framework/core/src/Events/DiscussionWasRead.php
+++ b/framework/core/src/Events/DiscussionWasRead.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/DiscussionWasRenamed.php b/framework/core/src/Events/DiscussionWasRenamed.php
index 1f48015b0..bea68b5f2 100644
--- a/framework/core/src/Events/DiscussionWasRenamed.php
+++ b/framework/core/src/Events/DiscussionWasRenamed.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/DiscussionWasStarted.php b/framework/core/src/Events/DiscussionWasStarted.php
index 0a4f78b5e..1d4d1be04 100644
--- a/framework/core/src/Events/DiscussionWasStarted.php
+++ b/framework/core/src/Events/DiscussionWasStarted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/DiscussionWillBeDeleted.php b/framework/core/src/Events/DiscussionWillBeDeleted.php
index 6aea21945..71bc819aa 100644
--- a/framework/core/src/Events/DiscussionWillBeDeleted.php
+++ b/framework/core/src/Events/DiscussionWillBeDeleted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/DiscussionWillBeSaved.php b/framework/core/src/Events/DiscussionWillBeSaved.php
index cb93c0933..1eb78ef76 100644
--- a/framework/core/src/Events/DiscussionWillBeSaved.php
+++ b/framework/core/src/Events/DiscussionWillBeSaved.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/FormatterConfigurator.php b/framework/core/src/Events/FormatterConfigurator.php
index f42a13e98..ec6d2b80f 100644
--- a/framework/core/src/Events/FormatterConfigurator.php
+++ b/framework/core/src/Events/FormatterConfigurator.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/FormatterParser.php b/framework/core/src/Events/FormatterParser.php
index c6c0e394c..8b1998bcd 100644
--- a/framework/core/src/Events/FormatterParser.php
+++ b/framework/core/src/Events/FormatterParser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/FormatterRenderer.php b/framework/core/src/Events/FormatterRenderer.php
index fdb8e129e..50c7c75b6 100644
--- a/framework/core/src/Events/FormatterRenderer.php
+++ b/framework/core/src/Events/FormatterRenderer.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/GetUserGroups.php b/framework/core/src/Events/GetUserGroups.php
index 415705ee2..53866423f 100644
--- a/framework/core/src/Events/GetUserGroups.php
+++ b/framework/core/src/Events/GetUserGroups.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/GroupWasCreated.php b/framework/core/src/Events/GroupWasCreated.php
index 24d3d02bf..50676a1db 100644
--- a/framework/core/src/Events/GroupWasCreated.php
+++ b/framework/core/src/Events/GroupWasCreated.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/GroupWasDeleted.php b/framework/core/src/Events/GroupWasDeleted.php
index 41e9069db..75f5d3087 100644
--- a/framework/core/src/Events/GroupWasDeleted.php
+++ b/framework/core/src/Events/GroupWasDeleted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/GroupWasRenamed.php b/framework/core/src/Events/GroupWasRenamed.php
index 8e0237b2b..855e0f6dc 100644
--- a/framework/core/src/Events/GroupWasRenamed.php
+++ b/framework/core/src/Events/GroupWasRenamed.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/GroupWillBeDeleted.php b/framework/core/src/Events/GroupWillBeDeleted.php
index f50b439ad..5890b7b10 100644
--- a/framework/core/src/Events/GroupWillBeDeleted.php
+++ b/framework/core/src/Events/GroupWillBeDeleted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/GroupWillBeSaved.php b/framework/core/src/Events/GroupWillBeSaved.php
index d7516920f..ea07cfc86 100644
--- a/framework/core/src/Events/GroupWillBeSaved.php
+++ b/framework/core/src/Events/GroupWillBeSaved.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/ModelAllow.php b/framework/core/src/Events/ModelAllow.php
index eaf552de6..7babc1fdc 100644
--- a/framework/core/src/Events/ModelAllow.php
+++ b/framework/core/src/Events/ModelAllow.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/ModelDates.php b/framework/core/src/Events/ModelDates.php
index 85ebf798b..a75563f4d 100644
--- a/framework/core/src/Events/ModelDates.php
+++ b/framework/core/src/Events/ModelDates.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/ModelRelationship.php b/framework/core/src/Events/ModelRelationship.php
index e2cbd8481..fe693d18e 100644
--- a/framework/core/src/Events/ModelRelationship.php
+++ b/framework/core/src/Events/ModelRelationship.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/ModelValidator.php b/framework/core/src/Events/ModelValidator.php
index 95b5b1902..33207e4fe 100644
--- a/framework/core/src/Events/ModelValidator.php
+++ b/framework/core/src/Events/ModelValidator.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/NotificationWillBeSent.php b/framework/core/src/Events/NotificationWillBeSent.php
index 8a1fd3de6..0faecc6e8 100644
--- a/framework/core/src/Events/NotificationWillBeSent.php
+++ b/framework/core/src/Events/NotificationWillBeSent.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/PostWasDeleted.php b/framework/core/src/Events/PostWasDeleted.php
index 08444e530..0c6d0e5ca 100644
--- a/framework/core/src/Events/PostWasDeleted.php
+++ b/framework/core/src/Events/PostWasDeleted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/PostWasHidden.php b/framework/core/src/Events/PostWasHidden.php
index 76098c0c6..366c5b62b 100644
--- a/framework/core/src/Events/PostWasHidden.php
+++ b/framework/core/src/Events/PostWasHidden.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/PostWasPosted.php b/framework/core/src/Events/PostWasPosted.php
index 1f33b6778..d17ee4f91 100644
--- a/framework/core/src/Events/PostWasPosted.php
+++ b/framework/core/src/Events/PostWasPosted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/PostWasRestored.php b/framework/core/src/Events/PostWasRestored.php
index 5d3e03a44..1780461ce 100644
--- a/framework/core/src/Events/PostWasRestored.php
+++ b/framework/core/src/Events/PostWasRestored.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/PostWasRevised.php b/framework/core/src/Events/PostWasRevised.php
index b61e3b858..bc4091c70 100644
--- a/framework/core/src/Events/PostWasRevised.php
+++ b/framework/core/src/Events/PostWasRevised.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/PostWillBeDeleted.php b/framework/core/src/Events/PostWillBeDeleted.php
index cd4c0db89..4235e33b7 100644
--- a/framework/core/src/Events/PostWillBeDeleted.php
+++ b/framework/core/src/Events/PostWillBeDeleted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/PostWillBeSaved.php b/framework/core/src/Events/PostWillBeSaved.php
index 6241321a9..1544107e3 100644
--- a/framework/core/src/Events/PostWillBeSaved.php
+++ b/framework/core/src/Events/PostWillBeSaved.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/RegisterApiRoutes.php b/framework/core/src/Events/RegisterApiRoutes.php
index 8dea4ab3e..3f382b0aa 100644
--- a/framework/core/src/Events/RegisterApiRoutes.php
+++ b/framework/core/src/Events/RegisterApiRoutes.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/RegisterDiscussionGambits.php b/framework/core/src/Events/RegisterDiscussionGambits.php
index 7c6186254..555db1c42 100644
--- a/framework/core/src/Events/RegisterDiscussionGambits.php
+++ b/framework/core/src/Events/RegisterDiscussionGambits.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/RegisterForumRoutes.php b/framework/core/src/Events/RegisterForumRoutes.php
index 49415a7ea..ccace2a9d 100644
--- a/framework/core/src/Events/RegisterForumRoutes.php
+++ b/framework/core/src/Events/RegisterForumRoutes.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/RegisterLocales.php b/framework/core/src/Events/RegisterLocales.php
index 98b547c82..66f681154 100644
--- a/framework/core/src/Events/RegisterLocales.php
+++ b/framework/core/src/Events/RegisterLocales.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/RegisterNotificationTypes.php b/framework/core/src/Events/RegisterNotificationTypes.php
index 25a800615..817a603d5 100644
--- a/framework/core/src/Events/RegisterNotificationTypes.php
+++ b/framework/core/src/Events/RegisterNotificationTypes.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/RegisterPostTypes.php b/framework/core/src/Events/RegisterPostTypes.php
index a9c5a2d92..5b1e9c91f 100644
--- a/framework/core/src/Events/RegisterPostTypes.php
+++ b/framework/core/src/Events/RegisterPostTypes.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/RegisterUserGambits.php b/framework/core/src/Events/RegisterUserGambits.php
index 7ec7d1f13..ca09cb86a 100644
--- a/framework/core/src/Events/RegisterUserGambits.php
+++ b/framework/core/src/Events/RegisterUserGambits.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/RegisterUserPreferences.php b/framework/core/src/Events/RegisterUserPreferences.php
index 56ab9936c..fa6918ad8 100644
--- a/framework/core/src/Events/RegisterUserPreferences.php
+++ b/framework/core/src/Events/RegisterUserPreferences.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/ScopeModelVisibility.php b/framework/core/src/Events/ScopeModelVisibility.php
index 2ac282232..a2b7c0c08 100644
--- a/framework/core/src/Events/ScopeModelVisibility.php
+++ b/framework/core/src/Events/ScopeModelVisibility.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/ScopePostVisibility.php b/framework/core/src/Events/ScopePostVisibility.php
index af39490d3..e761183b4 100644
--- a/framework/core/src/Events/ScopePostVisibility.php
+++ b/framework/core/src/Events/ScopePostVisibility.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserAvatarWasChanged.php b/framework/core/src/Events/UserAvatarWasChanged.php
index 83c154946..f66870d95 100644
--- a/framework/core/src/Events/UserAvatarWasChanged.php
+++ b/framework/core/src/Events/UserAvatarWasChanged.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserBioWasChanged.php b/framework/core/src/Events/UserBioWasChanged.php
index 944430fbc..fc72f0157 100644
--- a/framework/core/src/Events/UserBioWasChanged.php
+++ b/framework/core/src/Events/UserBioWasChanged.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserEmailChangeWasRequested.php b/framework/core/src/Events/UserEmailChangeWasRequested.php
index f5647ba48..250c5c663 100644
--- a/framework/core/src/Events/UserEmailChangeWasRequested.php
+++ b/framework/core/src/Events/UserEmailChangeWasRequested.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserEmailWasChanged.php b/framework/core/src/Events/UserEmailWasChanged.php
index 4815fd507..92b791e6b 100644
--- a/framework/core/src/Events/UserEmailWasChanged.php
+++ b/framework/core/src/Events/UserEmailWasChanged.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserGroupsWereChanged.php b/framework/core/src/Events/UserGroupsWereChanged.php
index 8cc2c0d03..e9236752f 100644
--- a/framework/core/src/Events/UserGroupsWereChanged.php
+++ b/framework/core/src/Events/UserGroupsWereChanged.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserLoggedIn.php b/framework/core/src/Events/UserLoggedIn.php
index c5971cff0..b6030d128 100644
--- a/framework/core/src/Events/UserLoggedIn.php
+++ b/framework/core/src/Events/UserLoggedIn.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserLoggedOut.php b/framework/core/src/Events/UserLoggedOut.php
index d6ec860ed..6be303621 100644
--- a/framework/core/src/Events/UserLoggedOut.php
+++ b/framework/core/src/Events/UserLoggedOut.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserPasswordWasChanged.php b/framework/core/src/Events/UserPasswordWasChanged.php
index 6cc98f6ba..68c2e23d7 100644
--- a/framework/core/src/Events/UserPasswordWasChanged.php
+++ b/framework/core/src/Events/UserPasswordWasChanged.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserSearchWillBePerformed.php b/framework/core/src/Events/UserSearchWillBePerformed.php
index 0c4b85ec4..fdfd60efa 100644
--- a/framework/core/src/Events/UserSearchWillBePerformed.php
+++ b/framework/core/src/Events/UserSearchWillBePerformed.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserWasActivated.php b/framework/core/src/Events/UserWasActivated.php
index 86f13a16d..a50008595 100644
--- a/framework/core/src/Events/UserWasActivated.php
+++ b/framework/core/src/Events/UserWasActivated.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserWasDeleted.php b/framework/core/src/Events/UserWasDeleted.php
index 2c76569ec..226d782be 100644
--- a/framework/core/src/Events/UserWasDeleted.php
+++ b/framework/core/src/Events/UserWasDeleted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserWasRegistered.php b/framework/core/src/Events/UserWasRegistered.php
index dc9e2c08a..b7385a66f 100644
--- a/framework/core/src/Events/UserWasRegistered.php
+++ b/framework/core/src/Events/UserWasRegistered.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserWasRenamed.php b/framework/core/src/Events/UserWasRenamed.php
index 1936865ae..3d1be8e7d 100644
--- a/framework/core/src/Events/UserWasRenamed.php
+++ b/framework/core/src/Events/UserWasRenamed.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserWillBeDeleted.php b/framework/core/src/Events/UserWillBeDeleted.php
index 9b8fcec71..80921e85d 100644
--- a/framework/core/src/Events/UserWillBeDeleted.php
+++ b/framework/core/src/Events/UserWillBeDeleted.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/UserWillBeSaved.php b/framework/core/src/Events/UserWillBeSaved.php
index ee59fd34f..5b29e4ff8 100644
--- a/framework/core/src/Events/UserWillBeSaved.php
+++ b/framework/core/src/Events/UserWillBeSaved.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Events/WillSerializeData.php b/framework/core/src/Events/WillSerializeData.php
index adab166ff..494245541 100644
--- a/framework/core/src/Events/WillSerializeData.php
+++ b/framework/core/src/Events/WillSerializeData.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Actions/ClientAction.php b/framework/core/src/Forum/Actions/ClientAction.php
index f86f7dfa0..bf358d1a3 100644
--- a/framework/core/src/Forum/Actions/ClientAction.php
+++ b/framework/core/src/Forum/Actions/ClientAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Actions/ConfirmEmailAction.php b/framework/core/src/Forum/Actions/ConfirmEmailAction.php
index ecc54e784..e56033b46 100644
--- a/framework/core/src/Forum/Actions/ConfirmEmailAction.php
+++ b/framework/core/src/Forum/Actions/ConfirmEmailAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Actions/DiscussionAction.php b/framework/core/src/Forum/Actions/DiscussionAction.php
index c6f505a07..35f7e96b8 100644
--- a/framework/core/src/Forum/Actions/DiscussionAction.php
+++ b/framework/core/src/Forum/Actions/DiscussionAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Actions/IndexAction.php b/framework/core/src/Forum/Actions/IndexAction.php
index d078f0018..bc2ad979c 100644
--- a/framework/core/src/Forum/Actions/IndexAction.php
+++ b/framework/core/src/Forum/Actions/IndexAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Actions/LoginAction.php b/framework/core/src/Forum/Actions/LoginAction.php
index ed93d5dd4..847c0c5a0 100644
--- a/framework/core/src/Forum/Actions/LoginAction.php
+++ b/framework/core/src/Forum/Actions/LoginAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Actions/LogoutAction.php b/framework/core/src/Forum/Actions/LogoutAction.php
index 7db5ded96..a3db4231f 100644
--- a/framework/core/src/Forum/Actions/LogoutAction.php
+++ b/framework/core/src/Forum/Actions/LogoutAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Actions/ResetPasswordAction.php b/framework/core/src/Forum/Actions/ResetPasswordAction.php
index 6b5cd6966..cd2784812 100644
--- a/framework/core/src/Forum/Actions/ResetPasswordAction.php
+++ b/framework/core/src/Forum/Actions/ResetPasswordAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Actions/SavePasswordAction.php b/framework/core/src/Forum/Actions/SavePasswordAction.php
index 725d81693..f4e978622 100644
--- a/framework/core/src/Forum/Actions/SavePasswordAction.php
+++ b/framework/core/src/Forum/Actions/SavePasswordAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Actions/WritesRememberCookie.php b/framework/core/src/Forum/Actions/WritesRememberCookie.php
index ecd36d588..a52872ed4 100644
--- a/framework/core/src/Forum/Actions/WritesRememberCookie.php
+++ b/framework/core/src/Forum/Actions/WritesRememberCookie.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php
index be81326c6..02def21e3 100644
--- a/framework/core/src/Forum/ForumServiceProvider.php
+++ b/framework/core/src/Forum/ForumServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Middleware/HandleErrors.php b/framework/core/src/Forum/Middleware/HandleErrors.php
index 6ee5fd26a..106edcdfa 100644
--- a/framework/core/src/Forum/Middleware/HandleErrors.php
+++ b/framework/core/src/Forum/Middleware/HandleErrors.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Forum/Middleware/LoginWithCookie.php b/framework/core/src/Forum/Middleware/LoginWithCookie.php
index ba9c54a9a..95e5e9605 100644
--- a/framework/core/src/Forum/Middleware/LoginWithCookie.php
+++ b/framework/core/src/Forum/Middleware/LoginWithCookie.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Install/Actions/IndexAction.php b/framework/core/src/Install/Actions/IndexAction.php
index 0c9d204d9..a0841c9cc 100644
--- a/framework/core/src/Install/Actions/IndexAction.php
+++ b/framework/core/src/Install/Actions/IndexAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Install/Actions/InstallAction.php b/framework/core/src/Install/Actions/InstallAction.php
index 695085b61..0cfeece54 100644
--- a/framework/core/src/Install/Actions/InstallAction.php
+++ b/framework/core/src/Install/Actions/InstallAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Install/Console/DataFromUser.php b/framework/core/src/Install/Console/DataFromUser.php
index 8c0fb4b37..4dc4ca923 100644
--- a/framework/core/src/Install/Console/DataFromUser.php
+++ b/framework/core/src/Install/Console/DataFromUser.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Install/Console/DefaultData.php b/framework/core/src/Install/Console/DefaultData.php
index 787f55c25..2c267e925 100644
--- a/framework/core/src/Install/Console/DefaultData.php
+++ b/framework/core/src/Install/Console/DefaultData.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Install/Console/ProvidesData.php b/framework/core/src/Install/Console/ProvidesData.php
index 8a5c6144e..6e6298b4b 100644
--- a/framework/core/src/Install/Console/ProvidesData.php
+++ b/framework/core/src/Install/Console/ProvidesData.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Install/InstallServiceProvider.php b/framework/core/src/Install/InstallServiceProvider.php
index 0e74eef31..95fa4c2ff 100644
--- a/framework/core/src/Install/InstallServiceProvider.php
+++ b/framework/core/src/Install/InstallServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Locale/JsCompiler.php b/framework/core/src/Locale/JsCompiler.php
index 8c9ec95dc..864df184f 100644
--- a/framework/core/src/Locale/JsCompiler.php
+++ b/framework/core/src/Locale/JsCompiler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Locale/LocaleManager.php b/framework/core/src/Locale/LocaleManager.php
index f92d48d38..398998142 100644
--- a/framework/core/src/Locale/LocaleManager.php
+++ b/framework/core/src/Locale/LocaleManager.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Locale/LocaleServiceProvider.php b/framework/core/src/Locale/LocaleServiceProvider.php
index 88d4f1f52..9d25ba6a1 100644
--- a/framework/core/src/Locale/LocaleServiceProvider.php
+++ b/framework/core/src/Locale/LocaleServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Locale/TranslationCompiler.php b/framework/core/src/Locale/TranslationCompiler.php
index dace2b8a2..1ff0a5a08 100644
--- a/framework/core/src/Locale/TranslationCompiler.php
+++ b/framework/core/src/Locale/TranslationCompiler.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Locale/Translator.php b/framework/core/src/Locale/Translator.php
index fef2a4361..9fc5358ca 100644
--- a/framework/core/src/Locale/Translator.php
+++ b/framework/core/src/Locale/Translator.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Migrations/Migration.php b/framework/core/src/Migrations/Migration.php
index 08841d29a..8f24024ce 100644
--- a/framework/core/src/Migrations/Migration.php
+++ b/framework/core/src/Migrations/Migration.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Migrations/Migrator.php b/framework/core/src/Migrations/Migrator.php
index 69a11179a..a582e18c5 100755
--- a/framework/core/src/Migrations/Migrator.php
+++ b/framework/core/src/Migrations/Migrator.php
@@ -60,10 +60,11 @@ class Migrator
      * @param  \Illuminate\Filesystem\Filesystem  $files
      * @return void
      */
-    public function __construct(MigrationRepositoryInterface $repository,
-                                Resolver $resolver,
-                                Filesystem $files)
-    {
+    public function __construct(
+        MigrationRepositoryInterface $repository,
+        Resolver $resolver,
+        Filesystem $files
+    ) {
         $this->files = $files;
         $this->resolver = $resolver;
         $this->repository = $repository;
diff --git a/framework/core/src/Support/ClientAction.php b/framework/core/src/Support/ClientAction.php
index 35c4a73f6..40f110ea8 100644
--- a/framework/core/src/Support/ClientAction.php
+++ b/framework/core/src/Support/ClientAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Support/ClientView.php b/framework/core/src/Support/ClientView.php
index 09ae0121c..25dca5f7f 100644
--- a/framework/core/src/Support/ClientView.php
+++ b/framework/core/src/Support/ClientView.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Support/Extension.php b/framework/core/src/Support/Extension.php
index 4fd866dcb..4b1192927 100644
--- a/framework/core/src/Support/Extension.php
+++ b/framework/core/src/Support/Extension.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Support/ExtensionManager.php b/framework/core/src/Support/ExtensionManager.php
index e2e7c9231..66a22a694 100644
--- a/framework/core/src/Support/ExtensionManager.php
+++ b/framework/core/src/Support/ExtensionManager.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Support/ExtensionsServiceProvider.php b/framework/core/src/Support/ExtensionsServiceProvider.php
index 2e42aca1f..6f47f7e2f 100644
--- a/framework/core/src/Support/ExtensionsServiceProvider.php
+++ b/framework/core/src/Support/ExtensionsServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Support/HtmlAction.php b/framework/core/src/Support/HtmlAction.php
index 34ddd2275..c1d908248 100644
--- a/framework/core/src/Support/HtmlAction.php
+++ b/framework/core/src/Support/HtmlAction.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *
diff --git a/framework/core/src/Support/ServiceProvider.php b/framework/core/src/Support/ServiceProvider.php
index 737c7b108..f30a2c13d 100644
--- a/framework/core/src/Support/ServiceProvider.php
+++ b/framework/core/src/Support/ServiceProvider.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*
  * This file is part of Flarum.
  *