diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 32849c2e..07f8d4c4 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -86,7 +86,7 @@ class AdminController extends Controller
         Request $request,
         PluginManager $plugins,
         Filesystem $filesystem,
-        Filter $filter
+        Filter $filter,
     ) {
         $db = config('database.connections.'.config('database.default'));
         $dbType = Arr::get([
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 6407da9d..6fb64413 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -50,7 +50,7 @@ class AuthController extends Controller
         Request $request,
         Rules\Captcha $captcha,
         Dispatcher $dispatcher,
-        Filter $filter
+        Filter $filter,
     ) {
         $data = $request->validate([
             'identification' => 'required',
@@ -151,7 +151,7 @@ class AuthController extends Controller
         Request $request,
         Rules\Captcha $captcha,
         Dispatcher $dispatcher,
-        Filter $filter
+        Filter $filter,
     ) {
         $can = $filter->apply('can_register', null);
         if ($can instanceof Rejection) {
@@ -248,7 +248,7 @@ class AuthController extends Controller
         Request $request,
         Rules\Captcha $captcha,
         Dispatcher $dispatcher,
-        Filter $filter
+        Filter $filter,
     ) {
         $data = $request->validate([
             'email' => 'required|email',
diff --git a/app/Http/Controllers/ClosetController.php b/app/Http/Controllers/ClosetController.php
index 3529cfa6..aac2ce7c 100644
--- a/app/Http/Controllers/ClosetController.php
+++ b/app/Http/Controllers/ClosetController.php
@@ -75,7 +75,7 @@ class ClosetController extends Controller
     public function add(
         Request $request,
         Dispatcher $dispatcher,
-        Filter $filter
+        Filter $filter,
     ) {
         ['tid' => $tid, 'name' => $name] = $request->validate([
             'tid' => 'required|integer',
@@ -132,7 +132,7 @@ class ClosetController extends Controller
         Request $request,
         Dispatcher $dispatcher,
         Filter $filter,
-        $tid
+        $tid,
     ) {
         ['name' => $name] = $request->validate(['name' => 'required']);
         /** @var User */
diff --git a/app/Http/Controllers/PlayerController.php b/app/Http/Controllers/PlayerController.php
index 057ecb2c..eb5b1764 100644
--- a/app/Http/Controllers/PlayerController.php
+++ b/app/Http/Controllers/PlayerController.php
@@ -124,7 +124,7 @@ class PlayerController extends Controller
     public function delete(
         Dispatcher $dispatcher,
         Filter $filter,
-        Player $player
+        Player $player,
     ) {
         /** @var User */
         $user = auth()->user();
@@ -157,7 +157,7 @@ class PlayerController extends Controller
         Request $request,
         Dispatcher $dispatcher,
         Filter $filter,
-        Player $player
+        Player $player,
     ) {
         $name = $request->validate([
             'name' => [
@@ -194,7 +194,7 @@ class PlayerController extends Controller
         Request $request,
         Dispatcher $dispatcher,
         Filter $filter,
-        Player $player
+        Player $player,
     ) {
         /** @var User */
         $user = auth()->user();
@@ -234,7 +234,7 @@ class PlayerController extends Controller
         Request $request,
         Dispatcher $dispatcher,
         Filter $filter,
-        Player $player
+        Player $player,
     ) {
         $types = $request->input('type', []);
 
diff --git a/app/Http/Controllers/PlayersManagementController.php b/app/Http/Controllers/PlayersManagementController.php
index f56e0aa7..9a90ab4e 100644
--- a/app/Http/Controllers/PlayersManagementController.php
+++ b/app/Http/Controllers/PlayersManagementController.php
@@ -44,7 +44,7 @@ class PlayersManagementController extends Controller
     public function name(
         Player $player,
         Request $request,
-        Dispatcher $dispatcher
+        Dispatcher $dispatcher,
     ) {
         $name = $request->validate([
             'player_name' => [
@@ -70,7 +70,7 @@ class PlayersManagementController extends Controller
     public function owner(
         Player $player,
         Request $request,
-        Dispatcher $dispatcher
+        Dispatcher $dispatcher,
     ) {
         $uid = $request->validate(['uid' => 'required|integer'])['uid'];
 
@@ -96,7 +96,7 @@ class PlayersManagementController extends Controller
     public function texture(
         Player $player,
         Request $request,
-        Dispatcher $dispatcher
+        Dispatcher $dispatcher,
     ) {
         $data = $request->validate([
             'tid' => 'required|integer',
@@ -123,7 +123,7 @@ class PlayersManagementController extends Controller
 
     public function delete(
         Player $player,
-        Dispatcher $dispatcher
+        Dispatcher $dispatcher,
     ) {
         $dispatcher->dispatch('player.deleting', [$player]);
 
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index b94f6420..2a1a314c 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -77,7 +77,7 @@ class ReportController extends Controller
     public function review(
         Report $report,
         Request $request,
-        Dispatcher $dispatcher
+        Dispatcher $dispatcher,
     ) {
         $data = $request->validate([
             'action' => ['required', Rule::in(['delete', 'ban', 'reject'])],
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 6092fc67..5407ff80 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -20,7 +20,7 @@ class SetupController extends Controller
         Request $request,
         Filesystem $filesystem,
         Connection $connection,
-        DatabaseManager $manager
+        DatabaseManager $manager,
     ) {
         if ($request->isMethod('get')) {
             try {
@@ -121,7 +121,7 @@ class SetupController extends Controller
                 'database/migrations',
                 'vendor/laravel/passport/database/migrations',
             ],
-          ]);
+        ]);
 
         $siteUrl = url('/');
         if (Str::endsWith($siteUrl, '/index.php')) {
diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php
index 92c8f936..2310050f 100644
--- a/app/Http/Controllers/SkinlibController.php
+++ b/app/Http/Controllers/SkinlibController.php
@@ -189,7 +189,7 @@ class SkinlibController extends Controller
     public function handleUpload(
         Request $request,
         Filter $filter,
-        Dispatcher $dispatcher
+        Dispatcher $dispatcher,
     ) {
         $file = $request->file('file');
         if ($file && !$file->isValid()) {
@@ -386,7 +386,7 @@ class SkinlibController extends Controller
         Request $request,
         Dispatcher $dispatcher,
         Filter $filter,
-        Texture $texture
+        Texture $texture,
     ) {
         $data = $request->validate(['name' => [
             'required',
@@ -416,7 +416,7 @@ class SkinlibController extends Controller
         Request $request,
         Dispatcher $dispatcher,
         Filter $filter,
-        Texture $texture
+        Texture $texture,
     ) {
         $data = $request->validate([
             'type' => ['required', Rule::in(['steve', 'alex', 'cape'])],
diff --git a/app/Http/Controllers/TranslationsController.php b/app/Http/Controllers/TranslationsController.php
index 5e011b0c..dce81ca7 100644
--- a/app/Http/Controllers/TranslationsController.php
+++ b/app/Http/Controllers/TranslationsController.php
@@ -40,7 +40,7 @@ class TranslationsController extends Controller
         Request $request,
         Application $app,
         JavaScript $js,
-        LanguageLine $line
+        LanguageLine $line,
     ) {
         $data = $request->validate(['text' => 'required|string']);
 
@@ -57,7 +57,7 @@ class TranslationsController extends Controller
     public function delete(
         Application $app,
         JavaScript $js,
-        LanguageLine $line
+        LanguageLine $line,
     ) {
         $line->delete();
 
diff --git a/app/Http/Middleware/CheckRole.php b/app/Http/Middleware/CheckRole.php
index 5cd83a54..62efa5e3 100644
--- a/app/Http/Middleware/CheckRole.php
+++ b/app/Http/Middleware/CheckRole.php
@@ -9,10 +9,10 @@ use Illuminate\Http\Request;
 class CheckRole
 {
     protected $roles = [
-        'banned' => USER::BANNED,
-        'normal' => USER::NORMAL,
-        'admin' => USER::ADMIN,
-        'super-admin' => USER::SUPER_ADMIN,
+        'banned' => User::BANNED,
+        'normal' => User::NORMAL,
+        'admin' => User::ADMIN,
+        'super-admin' => User::SUPER_ADMIN,
     ];
 
     public function handle(Request $request, Closure $next, $role)
diff --git a/app/Http/View/Composers/FootComposer.php b/app/Http/View/Composers/FootComposer.php
index 3db0e81c..54b8c55e 100644
--- a/app/Http/View/Composers/FootComposer.php
+++ b/app/Http/View/Composers/FootComposer.php
@@ -22,7 +22,7 @@ class FootComposer
         Request $request,
         JavaScript $javascript,
         Dispatcher $dispatcher,
-        Filter $filter
+        Filter $filter,
     ) {
         $this->request = $request;
         $this->javascript = $javascript;
diff --git a/app/Http/View/Composers/HeadComposer.php b/app/Http/View/Composers/HeadComposer.php
index 85c4da3f..3c05fe53 100644
--- a/app/Http/View/Composers/HeadComposer.php
+++ b/app/Http/View/Composers/HeadComposer.php
@@ -20,7 +20,7 @@ class HeadComposer
     public function __construct(
         Dispatcher $dispatcher,
         Request $request,
-        Filter $filter
+        Filter $filter,
     ) {
         $this->dispatcher = $dispatcher;
         $this->request = $request;
diff --git a/app/Models/Player.php b/app/Models/Player.php
index f716017f..8d0e68f1 100644
--- a/app/Models/Player.php
+++ b/app/Models/Player.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Events\PlayerProfileUpdated;
-use App\Models;
 use DateTimeInterface;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -57,17 +56,17 @@ class Player extends Model
 
     public function user()
     {
-        return $this->belongsTo(Models\User::class, 'uid');
+        return $this->belongsTo(User::class, 'uid');
     }
 
     public function skin()
     {
-        return $this->belongsTo(Models\Texture::class, 'tid_skin');
+        return $this->belongsTo(Texture::class, 'tid_skin');
     }
 
     public function cape()
     {
-        return $this->belongsTo(Models\Texture::class, 'tid_cape');
+        return $this->belongsTo(Texture::class, 'tid_cape');
     }
 
     public function getModelAttribute()
diff --git a/app/Services/OptionForm.php b/app/Services/OptionForm.php
index e60089e2..9d13a450 100644
--- a/app/Services/OptionForm.php
+++ b/app/Services/OptionForm.php
@@ -203,7 +203,7 @@ class OptionForm
     /**
      * Handle the HTTP post request and update modified options.
      */
-    public function handle(callable $callback = null): self
+    public function handle(?callable $callback = null): self
     {
         $request = request();
         $allPostData = $request->all();
diff --git a/app/Services/PluginManager.php b/app/Services/PluginManager.php
index 0a68fe24..293ed925 100644
--- a/app/Services/PluginManager.php
+++ b/app/Services/PluginManager.php
@@ -36,7 +36,7 @@ class PluginManager
         Application $app,
         Option $option,
         Dispatcher $dispatcher,
-        Filesystem $filesystem
+        Filesystem $filesystem,
     ) {
         $this->app = $app;
         $this->option = $option;
@@ -366,7 +366,7 @@ class PluginManager
      */
     public function formatUnresolved(
         Collection $unsatisfied,
-        Collection $conflicts
+        Collection $conflicts,
     ): array {
         $unsatisfied = $unsatisfied->map(function ($detail, $name) {
             if ($name === 'blessing-skin-server') {
diff --git a/app/Services/Translations/JavaScript.php b/app/Services/Translations/JavaScript.php
index 24958457..9990aa9a 100644
--- a/app/Services/Translations/JavaScript.php
+++ b/app/Services/Translations/JavaScript.php
@@ -20,7 +20,7 @@ class JavaScript
     public function __construct(
         Filesystem $filesystem,
         Repository $cache,
-        PluginManager $plugins
+        PluginManager $plugins,
     ) {
         $this->filesystem = $filesystem;
         $this->cache = $cache;
diff --git a/tests/HttpTest/ControllersTest/AuthControllerTest.php b/tests/HttpTest/ControllersTest/AuthControllerTest.php
index 518aaa7d..85528c4b 100644
--- a/tests/HttpTest/ControllersTest/AuthControllerTest.php
+++ b/tests/HttpTest/ControllersTest/AuthControllerTest.php
@@ -25,7 +25,7 @@ class AuthControllerTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        app()->instance(Captcha::class, new class() extends Captcha {
+        app()->instance(Captcha::class, new class extends Captcha {
             public function passes($attribute, $value)
             {
                 return true;
@@ -35,7 +35,7 @@ class AuthControllerTest extends TestCase
 
     public function testLogin()
     {
-        $filter = Fakes\Filter::fake();
+        $filter = Filter::fake();
 
         $this->get('/auth/login')->assertSee('Log in');
         $filter->assertApplied('auth_page_rows:login');
@@ -60,28 +60,28 @@ class AuthControllerTest extends TestCase
         // Should return a warning if length of `password` is lower than 6
         $this->postJson(
             '/auth/login', [
-            'identification' => $user->email,
-            'password' => '123',
-        ])->assertJsonValidationErrors('password');
+                'identification' => $user->email,
+                'password' => '123',
+            ])->assertJsonValidationErrors('password');
 
         // Should return a warning if length of `password` is greater than 32
         $this->postJson(
             '/auth/login', [
-            'identification' => $user->email,
-            'password' => Str::random(80),
-        ])->assertJsonValidationErrors('password');
+                'identification' => $user->email,
+                'password' => Str::random(80),
+            ])->assertJsonValidationErrors('password');
 
         $this->flushSession();
 
         // Should return a warning if user isn't existed
         $this->postJson(
             '/auth/login', [
-            'identification' => 'nope@nope.net',
-            'password' => '12345678',
-        ])->assertJson([
-            'code' => 2,
-            'message' => trans('auth.validation.user'),
-        ]);
+                'identification' => 'nope@nope.net',
+                'password' => '12345678',
+            ])->assertJson([
+                'code' => 2,
+                'message' => trans('auth.validation.user'),
+            ]);
         Event::assertDispatched('auth.login.attempt', function ($event, $payload) {
             $this->assertEquals('nope@nope.net', $payload[0]);
             $this->assertEquals('12345678', $payload[1]);
@@ -103,15 +103,15 @@ class AuthControllerTest extends TestCase
         // Logging in should be failed if password is wrong
         $this->postJson(
             '/auth/login', [
-            'identification' => $user->email,
-            'password' => 'wrong-password',
-        ])->assertJson(
-            [
-                'code' => 1,
-                'message' => trans('auth.validation.password'),
-                'data' => ['login_fails' => 1],
-            ]
-        );
+                'identification' => $user->email,
+                'password' => 'wrong-password',
+            ])->assertJson(
+                [
+                    'code' => 1,
+                    'message' => trans('auth.validation.password'),
+                    'data' => ['login_fails' => 1],
+                ]
+            );
         $filter->assertApplied('client_ip', function ($value) use ($ip) {
             $this->assertEquals($ip, $value);
 
@@ -143,8 +143,8 @@ class AuthControllerTest extends TestCase
         Cache::put($loginFailsCacheKey, 4);
         $this->postJson(
             '/auth/login', [
-            'identification' => $user->email,
-            'password' => '12345678',
+                'identification' => $user->email,
+                'password' => '12345678',
             ])->assertJsonValidationErrors('captcha');
 
         Cache::flush();
@@ -183,9 +183,9 @@ class AuthControllerTest extends TestCase
         auth()->logout();
         $this->postJson(
             '/auth/login', [
-            'identification' => $player->name,
-            'password' => '12345678',
-        ]
+                'identification' => $player->name,
+                'password' => '12345678',
+            ]
         )->assertJson(
             [
                 'code' => 0,
@@ -240,7 +240,7 @@ class AuthControllerTest extends TestCase
 
     public function testRegister()
     {
-        $filter = Fakes\Filter::fake();
+        $filter = Filter::fake();
 
         $this->get('/auth/register')->assertSee('Register');
         $filter->assertApplied('auth_page_rows:register');
diff --git a/tests/HttpTest/ControllersTest/ClosetControllerTest.php b/tests/HttpTest/ControllersTest/ClosetControllerTest.php
index fee589cb..e814d9af 100644
--- a/tests/HttpTest/ControllersTest/ClosetControllerTest.php
+++ b/tests/HttpTest/ControllersTest/ClosetControllerTest.php
@@ -41,20 +41,20 @@ class ClosetControllerTest extends TestCase
         $user->closet()->attach($cape->tid, ['item_name' => 'custom_name']);
         $this->getJson('/user/closet/list?category=cape')
             ->assertJson(['data' => [[
-                    'tid' => $cape->tid,
-                    'type' => 'cape',
-                    'pivot' => ['item_name' => 'custom_name'],
-                ],
+                'tid' => $cape->tid,
+                'type' => 'cape',
+                'pivot' => ['item_name' => 'custom_name'],
+            ],
             ]]);
 
         // Search by keyword
         $random = $textures->random();
         $this->getJson('/user/closet/list?q='.$random->name)
             ->assertJson(['data' => [[
-                    'tid' => $random->tid,
-                    'name' => $random->name,
-                    'type' => $random->type,
-                ],
+                'tid' => $random->tid,
+                'name' => $random->name,
+                'type' => $random->type,
+            ],
             ]]);
     }
 
diff --git a/tests/HttpTest/ControllersTest/PlayerControllerTest.php b/tests/HttpTest/ControllersTest/PlayerControllerTest.php
index ee70116c..d171151c 100644
--- a/tests/HttpTest/ControllersTest/PlayerControllerTest.php
+++ b/tests/HttpTest/ControllersTest/PlayerControllerTest.php
@@ -430,13 +430,13 @@ class PlayerControllerTest extends TestCase
 
         // success
         $this->deleteJson(route('user.player.clear', ['player' => $player]), [
-                'skin' => true,
-                'cape' => true,
-                'nope' => true, // invalid texture type is acceptable
-            ])->assertJson([
-                'code' => 0,
-                'message' => trans('user.player.clear.success', ['name' => $player->name]),
-            ]);
+            'skin' => true,
+            'cape' => true,
+            'nope' => true, // invalid texture type is acceptable
+        ])->assertJson([
+            'code' => 0,
+            'message' => trans('user.player.clear.success', ['name' => $player->name]),
+        ]);
         $this->assertEquals(0, Player::find($player->pid)->tid_skin);
         $this->assertEquals(0, Player::find($player->pid)->tid_cape);
         Event::assertDispatched(Events\PlayerProfileUpdated::class);
diff --git a/tests/HttpTest/ControllersTest/SkinlibControllerTest.php b/tests/HttpTest/ControllersTest/SkinlibControllerTest.php
index c9400307..02260e9a 100644
--- a/tests/HttpTest/ControllersTest/SkinlibControllerTest.php
+++ b/tests/HttpTest/ControllersTest/SkinlibControllerTest.php
@@ -480,15 +480,15 @@ class SkinlibControllerTest extends TestCase
         $texture->uploader = $user->uid;
         $texture->save();
         $this->postJson(route('texture.upload'), [
-                'name' => 'texture',
-                'public' => true,
-                'type' => 'steve',
-                'file' => $upload,
-            ])->assertJson([
-                'code' => 2,
-                'message' => trans('skinlib.upload.repeated'),
-                'data' => ['tid' => $texture->tid],
-            ]);
+            'name' => 'texture',
+            'public' => true,
+            'type' => 'steve',
+            'file' => $upload,
+        ])->assertJson([
+            'code' => 2,
+            'message' => trans('skinlib.upload.repeated'),
+            'data' => ['tid' => $texture->tid],
+        ]);
 
         // rejected
         $filter->add('can_upload_texture', function ($can, $file, $name) {
@@ -498,11 +498,11 @@ class SkinlibControllerTest extends TestCase
             return new Rejection('rejected');
         });
         $this->postJson(route('texture.upload'), [
-                'name' => 'texture',
-                'public' => true,
-                'type' => 'steve',
-                'file' => $upload,
-            ])->assertJson(['code' => 1, 'message' => 'rejected']);
+            'name' => 'texture',
+            'public' => true,
+            'type' => 'steve',
+            'file' => $upload,
+        ])->assertJson(['code' => 1, 'message' => 'rejected']);
 
         $disk->delete($texture->hash);
     }
diff --git a/tests/HttpTest/ControllersTest/UserControllerTest.php b/tests/HttpTest/ControllersTest/UserControllerTest.php
index 927f3e24..b43b9624 100644
--- a/tests/HttpTest/ControllersTest/UserControllerTest.php
+++ b/tests/HttpTest/ControllersTest/UserControllerTest.php
@@ -489,12 +489,12 @@ class UserControllerTest extends TestCase
         // Administrator cannot be deleted
         $this->actingAs(User::factory()->admin()->create())
             ->postJson('/user/profile', [
-            'action' => 'delete',
-            'password' => '87654321',
-        ])->assertJson([
-            'code' => 1,
-            'message' => trans('user.profile.delete.admin'),
-        ]);
+                'action' => 'delete',
+                'password' => '87654321',
+            ])->assertJson([
+                'code' => 1,
+                'message' => trans('user.profile.delete.admin'),
+            ]);
     }
 
     public function testSetAvatar()
diff --git a/tests/ServicesTest/PluginManagerTest.php b/tests/ServicesTest/PluginManagerTest.php
index 0e535ade..b8b1da83 100644
--- a/tests/ServicesTest/PluginManagerTest.php
+++ b/tests/ServicesTest/PluginManagerTest.php
@@ -425,7 +425,7 @@ class PluginManagerTest extends TestCase
                 ->with('/mayaka/callbacks.php')
                 ->once()
                 ->andReturn([
-                    \App\Events\PluginWasDeleted::class => function ($plugin) {
+                    Events\PluginWasDeleted::class => function ($plugin) {
                         $this->assertInstanceOf(Plugin::class, $plugin);
                         $this->assertEquals('mayaka', $plugin->name);
                     },
@@ -434,7 +434,7 @@ class PluginManagerTest extends TestCase
 
         app()->forgetInstance(PluginManager::class);
         resolve(PluginManager::class)->boot();
-        event(new \App\Events\PluginWasDeleted(new Plugin('/mayaka', ['name' => 'mayaka'])));
+        event(new Events\PluginWasDeleted(new Plugin('/mayaka', ['name' => 'mayaka'])));
     }
 
     public function testRegisterAutoload()