From 74b6325fc2da17fb5151469694b34379f0241ebc Mon Sep 17 00:00:00 2001
From: Duo Incure <duoincuredev@gmail.com>
Date: Mon, 31 Jul 2023 14:11:41 +0100
Subject: [PATCH] =?UTF-8?q?fix=20phpstan=20finally=20=F0=9F=A7=8D=E2=80=8D?=
 =?UTF-8?q?=E2=99=82=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SkyBlocksPM/commands/SkyBlockCommand.php  | 22 +++++++++----------
 .../commands/args/IslandNameArgument.php      |  2 +-
 tools/phpstan/composer.json                   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Vecnavium/SkyBlocksPM/commands/SkyBlockCommand.php b/src/Vecnavium/SkyBlocksPM/commands/SkyBlockCommand.php
index e6c4bb3..b31eea9 100644
--- a/src/Vecnavium/SkyBlocksPM/commands/SkyBlockCommand.php
+++ b/src/Vecnavium/SkyBlocksPM/commands/SkyBlockCommand.php
@@ -28,17 +28,17 @@ public function __construct(SkyBlocksPM $plugin){
 
     public function prepare(): void {
         $this->setPermission('skyblockspm.command');
-        $this->registerSubCommand(new AcceptSubCommand($this->plugin, 'accept', 'Accept the incoming invite to a SkyBlock Island'));
-        $this->registerSubCommand(new ChatSubCommand($this->plugin, 'chat', 'Chat with your SkyBlock Island members'));
-        $this->registerSubCommand(new CreateSubCommand($this->plugin, 'create', 'Create your own SkyBlock Island'));
-        $this->registerSubCommand(new DeleteSubCommand($this->plugin, 'delete', 'Delete a users SkyBlock Island', ['disband']));
-        $this->registerSubCommand(new KickSubCommand($this->plugin, 'kick', 'Kick a member from your SkyBlock Island'));
-        $this->registerSubCommand(new LeaveSubCommand($this->plugin, 'leave', 'Leave your current SkyBlock Island'));
-        $this->registerSubCommand(new SettingsSubCommand($this->plugin, 'settings', 'Edit your SkyBlock Island settings'));
-        $this->registerSubCommand(new SetWorldCommand($this->plugin, 'setworld', 'Sets the current world as the SkyBlock World which will be copied to newer worlds upon Island creation'));
-        $this->registerSubCommand(new TpSubCommand($this->plugin, 'tp', 'Teleport to a users SkyBlock Island', ['go', 'home']));
-        $this->registerSubCommand(new InviteSubCommand($this->plugin, 'invite', 'Invites the player to your SkyBlock Island'));
-        $this->registerSubCommand(new VisitSubCommand($this->plugin, 'visit', 'Visit a players SkyBlock Island'));
+        $this->registerSubCommand(new AcceptSubCommand($this->getOwningPlugin(), 'accept', 'Accept the incoming invite to a SkyBlock Island'));
+        $this->registerSubCommand(new ChatSubCommand($this->getOwningPlugin(), 'chat', 'Chat with your SkyBlock Island members'));
+        $this->registerSubCommand(new CreateSubCommand($this->getOwningPlugin(), 'create', 'Create your own SkyBlock Island'));
+        $this->registerSubCommand(new DeleteSubCommand($this->getOwningPlugin(), 'delete', 'Delete a users SkyBlock Island', ['disband']));
+        $this->registerSubCommand(new KickSubCommand($this->getOwningPlugin(), 'kick', 'Kick a member from your SkyBlock Island'));
+        $this->registerSubCommand(new LeaveSubCommand($this->getOwningPlugin(), 'leave', 'Leave your current SkyBlock Island'));
+        $this->registerSubCommand(new SettingsSubCommand($this->getOwningPlugin(), 'settings', 'Edit your SkyBlock Island settings'));
+        $this->registerSubCommand(new SetWorldCommand($this->getOwningPlugin(), 'setworld', 'Sets the current world as the SkyBlock World which will be copied to newer worlds upon Island creation'));
+        $this->registerSubCommand(new TpSubCommand($this->getOwningPlugin(), 'tp', 'Teleport to a users SkyBlock Island', ['go', 'home']));
+        $this->registerSubCommand(new InviteSubCommand($this->getOwningPlugin(), 'invite', 'Invites the player to your SkyBlock Island'));
+        $this->registerSubCommand(new VisitSubCommand($this->getOwningPlugin(), 'visit', 'Visit a players SkyBlock Island'));
     }
 
     /**
diff --git a/src/Vecnavium/SkyBlocksPM/commands/args/IslandNameArgument.php b/src/Vecnavium/SkyBlocksPM/commands/args/IslandNameArgument.php
index cefcc59..8f61329 100644
--- a/src/Vecnavium/SkyBlocksPM/commands/args/IslandNameArgument.php
+++ b/src/Vecnavium/SkyBlocksPM/commands/args/IslandNameArgument.php
@@ -32,7 +32,7 @@ public function canParse(string $testString, CommandSender $sender): bool {
      * @param CommandSender $sender
      * @return mixed
      */
-    public function parse(string $argument, CommandSender $sender): string {
+    public function parse(string $argument, CommandSender $sender): mixed {
         return $argument;
     }
 
diff --git a/tools/phpstan/composer.json b/tools/phpstan/composer.json
index cf07278..033dddb 100644
--- a/tools/phpstan/composer.json
+++ b/tools/phpstan/composer.json
@@ -8,7 +8,7 @@
             "source": {
                 "url": "https://github.com/Paroxity/Commando.git",
                 "type": "git",
-                "reference": "master"
+                "reference": "7a018dce089f9cc59183852786a596be00068cb3"
             },
             "autoload": {
                 "classmap": ["src/"]