Ensure PocketVote works with the latest PMMP.

This adds the now required return types.

Author: ProjectInfinity

plugin.yml

@@ -1,7 +1,7 @@
 name: PocketVote
 main: ProjectInfinity\PocketVote\PocketVote
-version: 2.0.1
-api: [2.0.0, 3.0.0-ALPHA1, 3.0.0-ALPHA2, 3.0.0-ALPHA3, 3.0.0-ALPHA4, 3.0.0-ALPHA5]
+version: 2.0.2
+api: [3.0.0-ALPHA6, 3.0.0-ALPHA7]
 author: ProjectInfinity
 permissions:
   pocketvote.admin:

src/ProjectInfinity/PocketVote/cmd/PocketVoteCommand.php

@@ -5,6 +5,7 @@
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\PluginIdentifiableCommand;
+use pocketmine\plugin\Plugin;
 use pocketmine\utils\TextFormat;
 use ProjectInfinity\PocketVote\PocketVote;
 use ProjectInfinity\PocketVote\task\guru\SetLinkNameTask;
@@ -19,7 +20,7 @@ public function __construct(PocketVote $plugin) {
         $this->plugin = $plugin;
     }
 
-    public function execute(CommandSender $sender, $commandLabel, array $args) {
+    public function execute(CommandSender $sender, string $commandLabel, array $args) {
         if(!$sender->hasPermission('pocketvote.admin')) {
             $sender->sendMessage(TextFormat::RED.'You do not have permission to administer PocketVote.');
             return true;
@@ -187,7 +188,7 @@ public function execute(CommandSender $sender, $commandLabel, array $args) {
         return true;
     }
 
-    public function getPlugin() {
+    public function getPlugin(): Plugin {
         return $this->plugin;
     }
 }

src/ProjectInfinity/PocketVote/cmd/VoteCommand.php

@@ -5,6 +5,7 @@
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\PluginIdentifiableCommand;
+use pocketmine\plugin\Plugin;
 use pocketmine\utils\TextFormat;
 use ProjectInfinity\PocketVote\PocketVote;
 use ProjectInfinity\PocketVote\task\TopVoterTask;
@@ -18,7 +19,7 @@ public function __construct(PocketVote $plugin) {
         $this->plugin = $plugin;
     }
 
-    public function execute(CommandSender $sender, $commandLabel, array $args) {
+    public function execute(CommandSender $sender, String $commandLabel, array $args) {
         if(!$sender->hasPermission('pocketvote.vote')) {
             $sender->sendMessage(TextFormat::RED.'You do not have permission use /vote.');
             return true;
@@ -42,7 +43,7 @@ public function execute(CommandSender $sender, $commandLabel, array $args) {
         return true;
     }
 
-    public function getPlugin() {
+    public function getPlugin(): Plugin {
         return $this->plugin;
     }
 }

src/ProjectInfinity/PocketVote/cmd/guru/GuAddCommand.php

@@ -17,7 +17,7 @@ public function __construct(PocketVote $plugin) {
         $this->plugin = $plugin;
     }
 
-    public function execute(CommandSender $sender, $commandLabel, array $args) {
+    public function execute(CommandSender $sender, String $commandLabel, array $args) {
         if(!$sender->hasPermission('pocketvote.admin')) {
             $sender->sendMessage(TextFormat::RED.'You do not have permission to do that!');
             return true;

src/ProjectInfinity/PocketVote/cmd/guru/GuDelCommand.php

@@ -17,7 +17,7 @@ public function __construct(PocketVote $plugin) {
         $this->plugin = $plugin;
     }
 
-    public function execute(CommandSender $sender, $commandLabel, array $args) {
+    public function execute(CommandSender $sender, String $commandLabel, array $args) {
         if(!$sender->hasPermission('pocketvote.admin')) {
             $sender->sendMessage(TextFormat::RED.'You do not have permission to do that!');
             return true;

src/ProjectInfinity/PocketVote/cmd/guru/GuListCommand.php

@@ -15,7 +15,7 @@ public function __construct(PocketVote $plugin) {
         $this->plugin = $plugin;
     }
 
-    public function execute(CommandSender $sender, $commandLabel, array $args) {
+    public function execute(CommandSender $sender, String $commandLabel, array $args) {
         if(!$sender->hasPermission('pocketvote.admin')) {
             $sender->sendMessage(TextFormat::RED.'You do not have permission to do that.');
             return true;

src/ProjectInfinity/PocketVote/cmd/guru/GuruCommand.php

@@ -12,7 +12,7 @@ public function __construct() {
         parent::__construct('guru', 'MCPE Guru help command', '/guru [subject]', ['gu']);
     }
 
-    public function execute(CommandSender $sender, $commandLabel, array $args) {
+    public function execute(CommandSender $sender, String $commandLabel, array $args) {
         if(!$sender->hasPermission('pocketvote.admin')) {
             $sender->sendMessage(TextFormat::RED.'You do not have permission to do that.');
             return true;

src/ProjectInfinity/PocketVote/task/ExpireVotesTask.php

@@ -1,14 +1,14 @@
-<?php
-
-namespace ProjectInfinity\PocketVote\task;
-
-use pocketmine\scheduler\Task;
-use ProjectInfinity\PocketVote\PocketVote;
-
-class ExpireVotesTask extends Task {
-
-    public function onRun($currentTick) {
-        PocketVote::getPlugin()->getLogger()->debug('Cleaning up expired votes.');
-        PocketVote::getPlugin()->getVoteManager()->expireVotes();
-    }
+<?php
+
+namespace ProjectInfinity\PocketVote\task;
+
+use pocketmine\scheduler\Task;
+use ProjectInfinity\PocketVote\PocketVote;
+
+class ExpireVotesTask extends Task {
+
+    public function onRun(int $currentTick) {
+        PocketVote::getPlugin()->getLogger()->debug('Cleaning up expired votes.');
+        PocketVote::getPlugin()->getVoteManager()->expireVotes();
+    }
 }

src/ProjectInfinity/PocketVote/task/SchedulerTask.php

@@ -15,7 +15,7 @@ public function __construct(PocketVote $plugin) {
         $this->version = $plugin->getDescription()->getVersion();
     }
 
-    public function onRun($currentTick) {
+    public function onRun(int $currentTick) {
         $this->plugin->getLogger()->debug('Checking for outstanding votes.');
         if(!$this->plugin->multiserver || ($this->plugin->multiserver && strtolower($this->plugin->multiserver_role) === 'master')) $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new VoteCheckTask($this->plugin->identity, $this->plugin->secret, $this->version));
         if($this->plugin->multiserver && strtolower($this->plugin->multiserver_role) === 'slave') $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new SlaveCheckTask());