Passing PHPStan level 7 (#364)

Author: jasonw4331

phpstan.neon.dist

@@ -1,14 +1,9 @@
 parameters:
-    level: 7
-    checkMissingIterableValueType: false
-    reportUnmatchedIgnoredErrors: false
-    paths:
-        - /source/src
-        - /deps
-    autoload_files:
-        - phar:///pocketmine/PocketMine-MP.phar/vendor/autoload.php
-    autoload_directories:
-        - /source/src
-        - /deps
-    excludes_analyse:
-        - /deps
+	level: 7
+	paths:
+		- /source/src
+	scanDirectories:
+		- /source/src
+		- /deps
+	bootstrapFiles:
+		- phar:///pocketmine/PocketMine-MP.phar/vendor/autoload.php

plugin.yml

@@ -1,6 +1,6 @@
 name: MyPlot
 main: MyPlot\MyPlot
-version: 1.9.0
+version: 1.10.0
 api:
 - 3.4.0
 authors:

src/MyPlot/Commands.php

@@ -116,7 +116,7 @@ public function __construct(MyPlot $plugin) {
 				preg_match_all('/(\s?[<\[]?\s*)([a-zA-Z0-9|]+)(?:\s*:?\s*)(string|int|x y z|float|mixed|target|message|text|json|command|boolean|bool)?(?:\s*[>\]]?\s?)/iu', $usage, $matches, PREG_PATTERN_ORDER, strlen($commandString));
 				$argumentCount = count($matches[0])-1;
 				for($argNumber = 1; $argNumber <= $argumentCount; ++$argNumber) {
-					$optional = empty($matches[1][$argNumber]) ? false : ($matches[1][$argNumber] === '[');
+					$optional = $matches[1][$argNumber] === '' ? false : ($matches[1][$argNumber] === '[');
 					$paramName = strtolower($matches[2][$argNumber]);
 					if(stripos($paramName, "|") === false) {
 						switch(strtolower($matches[3][$argNumber])) {
@@ -189,19 +189,13 @@ public function getCommands() : array {
 		return $this->subCommands;
 	}
 
-	/**
-	 * @param SubCommand $command
-	 */
 	public function loadSubCommand(SubCommand $command) : void {
 		$this->subCommands[$command->getName()] = $command;
 		if($command->getAlias() != "") {
 			$this->aliasSubCommands[$command->getAlias()] = $command;
 		}
 	}
 
-	/**
-	 * @param string $name
-	 */
 	public function unloadSubCommand(string $name) : void {
 		$subcommand = $this->subCommands[$name] ?? $this->aliasSubCommands[$name] ?? null;
 		if($subcommand !== null) {
@@ -232,7 +226,7 @@ public function execute(CommandSender $sender, string $alias, array $args) : boo
 				return true;
 			}
 		}
-		$subCommand = strtolower(array_shift($args));
+		$subCommand = strtolower((string)array_shift($args));
 		if(isset($this->subCommands[$subCommand])) {
 			$command = $this->subCommands[$subCommand];
 		}elseif(isset($this->aliasSubCommands[$subCommand])) {

src/MyPlot/EventListener.php

@@ -51,16 +51,16 @@ public function onLevelLoad(LevelLoadEvent $event) : void {
 		if(file_exists($this->plugin->getDataFolder()."worlds".DIRECTORY_SEPARATOR.$event->getLevel()->getFolderName().".yml")) {
 			$this->plugin->getLogger()->debug("MyPlot level " . $event->getLevel()->getFolderName() . " loaded!");
 			$settings = $event->getLevel()->getProvider()->getGeneratorOptions();
-			if(!isset($settings["preset"]) or empty($settings["preset"])) {
+			if(!isset($settings["preset"]) or !is_string($settings["preset"]) or $settings["preset"] === "") {
 				return;
 			}
 			$settings = json_decode($settings["preset"], true);
 			if($settings === false) {
 				return;
 			}
 			$levelName = $event->getLevel()->getFolderName();
-			$default = array_filter($this->plugin->getConfig()->get("DefaultWorld", []), function($key){
-				return !in_array($key, ["PlotSize", "GroundHeight", "RoadWidth", "RoadBlock", "WallBlock", "PlotFloorBlock", "PlotFillBlock", "BottomBlock"]);
+			$default = array_filter((array) $this->plugin->getConfig()->get("DefaultWorld", []), function($key) : bool {
+				return !in_array($key, ["PlotSize", "GroundHeight", "RoadWidth", "RoadBlock", "WallBlock", "PlotFloorBlock", "PlotFillBlock", "BottomBlock"], true);
 			}, ARRAY_FILTER_USE_KEY);
 			$config = new Config($this->plugin->getDataFolder()."worlds".DIRECTORY_SEPARATOR.$levelName.".yml", Config::YAML, $default);
 			foreach(array_keys($default) as $key) {
@@ -134,7 +134,7 @@ public function onSignChange(SignChangeEvent $event) : void {
 	private function onEventOnBlock($event) : void {
 		if(!$event->getBlock()->isValid())
 			return;
-		$levelName = $event->getBlock()->getLevel()->getFolderName();
+		$levelName = $event->getBlock()->getLevelNonNull()->getFolderName();
 		if(!$this->plugin->isLevelLoaded($levelName)) {
 			return;
 		}
@@ -198,7 +198,7 @@ public function onExplosion(EntityExplodeEvent $event) : void {
 		if($event->isCancelled()) {
 			return;
 		}
-		$levelName = $event->getEntity()->getLevel()->getFolderName();
+		$levelName = $event->getEntity()->getLevelNonNull()->getFolderName();
 		if(!$this->plugin->isLevelLoaded($levelName))
 			return;
 		$plot = $this->plugin->getPlotByPosition($event->getPosition());
@@ -208,10 +208,11 @@ public function onExplosion(EntityExplodeEvent $event) : void {
 		}
 		$beginPos = $this->plugin->getPlotPosition($plot);
 		$endPos = clone $beginPos;
-		$plotSize = $this->plugin->getLevelSettings($levelName)->plotSize;
+		$levelSettings = $this->plugin->getLevelSettings($levelName);
+		$plotSize = $levelSettings->plotSize;
 		$endPos->x += $plotSize;
 		$endPos->z += $plotSize;
-		$blocks = array_filter($event->getBlockList(), function($block) use ($beginPos, $endPos) {
+		$blocks = array_filter($event->getBlockList(), function($block) use ($beginPos, $endPos) : bool {
 			if($block->x >= $beginPos->x and $block->z >= $beginPos->z and $block->x < $endPos->x and $block->z < $endPos->z) {
 				return true;
 			}
@@ -253,7 +254,7 @@ public function onBlockSpread(BlockSpreadEvent $event) : void {
 		if($event->isCancelled()) {
 			return;
 		}
-		$levelName = $event->getBlock()->getLevel()->getFolderName();
+		$levelName = $event->getBlock()->getLevelNonNull()->getFolderName();
 		if(!$this->plugin->isLevelLoaded($levelName))
 			return;
 		$settings = $this->plugin->getLevelSettings($levelName);
@@ -305,16 +306,17 @@ public function onPlayerTeleport(EntityTeleportEvent $event) : void {
 	}
 
 	/**
+	 * @param Player $player
 	 * @param PlayerMoveEvent|EntityTeleportEvent $event
 	 */
 	private function onEventOnMove(Player $player, $event) : void {
-		$levelName = $player->getLevel()->getFolderName();
+		$levelName = $player->getLevelNonNull()->getFolderName();
 		if (!$this->plugin->isLevelLoaded($levelName))
 			return;
 		$plot = $this->plugin->getPlotByPosition($event->getTo());
 		$plotFrom = $this->plugin->getPlotByPosition($event->getFrom());
 		if($plot !== null and ($plotFrom === null or !$plot->isSame($plotFrom))) {
-			if(strpos((string) $plot, "-0")) {
+			if(strpos((string) $plot, "-0") !== false) {
 				return;
 			}
 			$ev = new MyPlotPlayerEnterPlotEvent($plot, $player);
@@ -328,11 +330,11 @@ private function onEventOnMove(Player $player, $event) : void {
 			if($event->isCancelled()) {
 				return;
 			}
-			if(!$this->plugin->getConfig()->get("ShowPlotPopup", true))
+			if(!(bool) $this->plugin->getConfig()->get("ShowPlotPopup", true))
 				return;
 			$popup = $this->plugin->getLanguage()->translateString("popup", [TextFormat::GREEN . $plot]);
 			$price = TextFormat::GREEN . $plot->price;
-			if(!empty($plot->owner)) {
+			if($plot->owner !== "") {
 				$owner = TextFormat::GREEN . $plot->owner;
 				if($plot->price > 0 and $plot->owner !== $player->getName()) {
 					$ownerPopup = $this->plugin->getLanguage()->translateString("popup.forsale", [$owner.TextFormat::WHITE, $price.TextFormat::WHITE]);
@@ -348,15 +350,15 @@ private function onEventOnMove(Player $player, $event) : void {
 			$popup = TextFormat::WHITE . $paddingPopup . $popup . "\n" . TextFormat::WHITE . $paddingOwnerPopup . $ownerPopup;
 			$ev->getPlayer()->sendTip($popup);
 		}elseif($plotFrom !== null and ($plot === null or !$plot->isSame($plotFrom))) {
-			if(strpos((string) $plotFrom, "-0")) {
+			if(strpos((string) $plotFrom, "-0") !== false) {
 				return;
 			}
 			$ev = new MyPlotPlayerLeavePlotEvent($plotFrom, $player);
 			$ev->setCancelled($event->isCancelled());
 			$ev->call();
 			$event->setCancelled($ev->isCancelled());
 		}elseif($plotFrom !== null and $plot !== null and ($plot->isDenied($player->getName()) or $plot->isDenied("*")) and $plot->owner !== $player->getName() and !$player->hasPermission("myplot.admin.denyplayer.bypass")) {
-			$this->plugin->teleportPlayerToPlot($player, $plot, false);
+			$this->plugin->teleportPlayerToPlot($player, $plot);
 		}
 	}
 
@@ -370,7 +372,7 @@ public function onEntityDamage(EntityDamageByEntityEvent $event) : void {
 		$damaged = $event->getEntity();
 		$damager = $event->getDamager();
 		if($damaged instanceof Player and $damager instanceof Player and !$event->isCancelled()) {
-			$levelName = $damaged->getLevel()->getFolderName();
+			$levelName = $damaged->getLevelNonNull()->getFolderName();
 			if(!$this->plugin->isLevelLoaded($levelName)) {
 				return;
 			}