Merge commit '8e1b3ed'

# Conflicts: # phpstan.neon.dist # resources/vanilla # tests/phpstan/configs/phpstan-bugs.neon # tests/phpstan/configs/phpunit-wiring-tests.neon # tests/phpstan/configs/pthreads-bugs.neon # tests/phpstan/configs/runtime-type-checks.neon
2025-09-04 17:06:16 +00:00 · 2020-04-25 12:35:30 +01:00
parent bb8ef3ff6d 8e1b3edd2c
commit 040fdc2875
10 changed files with 203 additions and 182 deletions
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@ -1,4 +1,5 @@
 includes:
+	- tests/phpstan/configs/actual-problems.neon
 	- tests/phpstan/configs/com-dotnet-magic.neon
 	- tests/phpstan/configs/custom-leveldb.neon
 	- tests/phpstan/configs/ds-bugs.neon
@ -38,105 +39,3 @@ parameters:
 	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
 	staticReflectionClassNamePatterns:
 		- "#^COM$#"
-	ignoreErrors:
-		-
-			message: "#^Instanceof between pocketmine\\\\plugin\\\\PluginManager and pocketmine\\\\plugin\\\\PluginManager will always evaluate to true\\.$#"
-			count: 1
-			path: src/CrashDump.php
-
-		-
-			message: "#^Function parallel\\\\bootstrap not found\\.$#"
-			count: 1
-			path: src/PocketMine.php
-
-		-
-			message: "#^Instanceof between pocketmine\\\\plugin\\\\PluginManager and pocketmine\\\\plugin\\\\PluginManager will always evaluate to true\\.$#"
-			count: 1
-			path: src/Server.php
-
-		-
-			message: "#^Instanceof between pocketmine\\\\scheduler\\\\AsyncPool and pocketmine\\\\scheduler\\\\AsyncPool will always evaluate to true\\.$#"
-			count: 1
-			path: src/Server.php
-
-		-
-			message: "#^Instanceof between pocketmine\\\\command\\\\CommandReader and pocketmine\\\\command\\\\CommandReader will always evaluate to true\\.$#"
-			count: 1
-			path: src/Server.php
-
-		-
-			message: "#^Instanceof between pocketmine\\\\network\\\\Network and pocketmine\\\\network\\\\Network will always evaluate to true\\.$#"
-			count: 2
-			path: src/Server.php
-
-		-
-			message: "#^Instanceof between pocketmine\\\\world\\\\WorldManager and pocketmine\\\\world\\\\WorldManager will always evaluate to true\\.$#"
-			count: 1
-			path: src/Server.php
-
-		-
-			message: "#^Call to an undefined method pocketmine\\\\command\\\\CommandSender\\:\\:teleport\\(\\)\\.$#"
-			count: 1
-			path: src/command/defaults/TeleportCommand.php
-#			comment: "not actually possible, but high cost to fix warning"
-
-		-
-			message: "#^Method pocketmine\\\\event\\\\entity\\\\EntityDeathEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\Living but returns pocketmine\\\\entity\\\\Entity\\.$#"
-			count: 1
-			path: src/event/entity/EntityDeathEvent.php
-
-		-
-			message: "#^Method pocketmine\\\\event\\\\entity\\\\EntityShootBowEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\Living but returns pocketmine\\\\entity\\\\Entity\\.$#"
-			count: 1
-			path: src/event/entity/EntityShootBowEvent.php
-
-		-
-			message: "#^Property pocketmine\\\\event\\\\entity\\\\EntityShootBowEvent\\:\\:\\$projectile \\(pocketmine\\\\entity\\\\projectile\\\\Projectile\\) does not accept pocketmine\\\\entity\\\\Entity\\.$#"
-			count: 1
-			path: src/event/entity/EntityShootBowEvent.php
-
-		-
-			message: "#^Method pocketmine\\\\event\\\\entity\\\\ItemDespawnEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\object\\\\ItemEntity but returns pocketmine\\\\entity\\\\Entity\\.$#"
-			count: 1
-			path: src/event/entity/ItemDespawnEvent.php
-
-		-
-			message: "#^Method pocketmine\\\\event\\\\entity\\\\ItemSpawnEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\object\\\\ItemEntity but returns pocketmine\\\\entity\\\\Entity\\.$#"
-			count: 1
-			path: src/event/entity/ItemSpawnEvent.php
-
-		-
-			message: "#^Method pocketmine\\\\event\\\\entity\\\\ProjectileHitEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\projectile\\\\Projectile but returns pocketmine\\\\entity\\\\Entity\\.$#"
-			count: 1
-			path: src/event/entity/ProjectileHitEvent.php
-
-		-
-			message: "#^Method pocketmine\\\\event\\\\entity\\\\ProjectileLaunchEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\projectile\\\\Projectile but returns pocketmine\\\\entity\\\\Entity\\.$#"
-			count: 1
-			path: src/event/entity/ProjectileLaunchEvent.php
-
-		-
-			message: "#^pocketmine\\\\block\\\\inventory\\\\DoubleChestInventory\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\block\\\\inventory\\\\ChestInventory\\.$#"
-			count: 1
-			path: src/block/inventory/DoubleChestInventory.php
-
-		-
-			message: "#^Cannot instantiate interface pocketmine\\\\world\\\\format\\\\io\\\\WorldProvider\\.$#"
-			count: 1
-			path: src/world/WorldManager.php
-
-		-
-			message: "#^Cannot instantiate interface pocketmine\\\\world\\\\format\\\\io\\\\WritableWorldProvider\\.$#"
-			count: 1
-			path: src/world/WorldManager.php
-
-		-
-			message: "#^Variable property access on \\$this\\(pocketmine\\\\world\\\\generator\\\\PopulationTask\\)\\.$#"
-			count: 4
-			path: src/world/generator/PopulationTask.php
-
-		-
-			message: "#^Cannot instantiate interface pocketmine\\\\world\\\\format\\\\io\\\\WritableWorldProvider\\.$#"
-			count: 2
-			path: src/world/format/io/FormatConverter.php
-