Merge branch 'stable' of https://github.com/pmmp/PocketMine-MP into stable

composer.json

@@ -36,7 +36,11 @@
    "autoload": {
       "psr-4": {
          "": ["src"]
-      }
+      },
+      "files": [
+         "src/pocketmine/GlobalConstants.php",
+         "src/pocketmine/VersionInfo.php"
+      ]
    },
    "autoload-dev": {
       "psr-4": {

phpstan.neon

@@ -0,0 +1,176 @@
+
+
+parameters:
+	level: 1
+	paths:
+		- src
+	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
+	ignoreErrors:
+		-
+			message: "#^pocketmine\\\\Player\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\entity\\\\Human\\.$#"
+			path: src/pocketmine/Player.php
+
+		-
+			message: "#^Function pocketmine\\\\critical_error not found while trying to analyse it \\- autoloading is probably not configured properly\\.$#"
+			count: 1
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Function pocketmine\\\\check_platform_dependencies not found while trying to analyse it \\- autoloading is probably not configured properly\\.$#"
+			count: 1
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Function pocketmine\\\\emit_performance_warnings not found while trying to analyse it \\- autoloading is probably not configured properly\\.$#"
+			count: 1
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Function pocketmine\\\\set_ini_entries not found while trying to analyse it \\- autoloading is probably not configured properly\\.$#"
+			count: 1
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Function pocketmine\\\\server not found while trying to analyse it \\- autoloading is probably not configured properly\\.$#"
+			count: 1
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Function check_platform_dependencies not found\\.$#"
+			count: 1
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Function critical_error not found\\.$#"
+			count: 6
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Function set_ini_entries not found\\.$#"
+			count: 1
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Function emit_performance_warnings not found\\.$#"
+			count: 1
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Function pocketmine\\\\server not found\\.$#"
+			count: 1
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^Constant MIN_PHP_VERSION not found\\.$#"
+			count: 2
+			path: src/pocketmine/PocketMine.php
+
+		-
+			message: "#^pocketmine\\\\block\\\\[A-Za-z\\d]+\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\block\\\\Block\\.$#"
+			path: src/pocketmine/block
+
+		-
+			message: "#^pocketmine\\\\block\\\\Block\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\level\\\\Position\\.$#"
+			count: 1
+			path: src/pocketmine/block/Block.php
+
+		-
+			message: "#^pocketmine\\\\inventory\\\\DoubleChestInventory\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\inventory\\\\ChestInventory\\.$#"
+			count: 1
+			path: src/pocketmine/inventory/DoubleChestInventory.php
+
+		-
+			message: "#^pocketmine\\\\inventory\\\\EnderChestInventory\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\inventory\\\\ChestInventory\\.$#"
+			count: 1
+			path: src/pocketmine/inventory/EnderChestInventory.php
+
+		-
+			message: "#^pocketmine\\\\item\\\\GoldenAppleEnchanted\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\item\\\\GoldenApple\\.$#"
+			count: 1
+			path: src/pocketmine/item/GoldenAppleEnchanted.php
+
+		-
+			message: "#^pocketmine\\\\item\\\\WrittenBook\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\item\\\\WritableBook\\.$#"
+			count: 1
+			path: src/pocketmine/item/WrittenBook.php
+
+		-
+			message: "#^Constructor of class pocketmine\\\\level\\\\generator\\\\hell\\\\Nether has an unused parameter \\$options\\.$#"
+			count: 1
+			path: src/pocketmine/level/generator/hell/Nether.php
+
+		-
+			message: "#^Constructor of class pocketmine\\\\level\\\\generator\\\\normal\\\\Normal has an unused parameter \\$options\\.$#"
+			count: 1
+			path: src/pocketmine/level/generator/normal/Normal.php
+
+		-
+			message: "#^Used constant pocketmine\\\\RESOURCE_PATH not found\\.$#"
+			count: 1
+			path: src/pocketmine/network/mcpe/protocol/StartGamePacket.php
+
+		-
+			message: "#^Instantiated class COM not found\\.$#"
+			count: 2
+			path: src/pocketmine/network/upnp/UPnP.php
+			comment: "only available on Windows"
+
+		-
+			message: "#^Constructor of class pocketmine\\\\scheduler\\\\TaskScheduler has an unused parameter \\$logger\\.$#"
+			count: 1
+			path: src/pocketmine/scheduler/TaskScheduler.php
+
+		-
+			message: "#^Variable \\$GLOBALS in isset\\(\\) always exists and is not nullable\\.$#"
+			path: src/pocketmine/MemoryManager.php
+			comment: "this isn't defined on threads (thanks pthreads)"
+
+		-
+			message: "#^Constant pocketmine\\\\COMPOSER_AUTOLOADER_PATH not found\\.$#"
+			path: src/pocketmine
+
+		-
+			message: "#^Constant pocketmine\\\\DATA not found\\.$#"
+			path: src/pocketmine
+
+		-
+			message: "#^Constant pocketmine\\\\GIT_COMMIT not found\\.$#"
+			path: src/pocketmine
+
+		-
+			message: "#^Constant pocketmine\\\\PATH not found\\.$#"
+			path: src/pocketmine
+
+		-
+			message: "#^Constant pocketmine\\\\PLUGIN_PATH not found\\.$#"
+			path: src/pocketmine
+
+		-
+			message: "#^Constant pocketmine\\\\RESOURCE_PATH not found\\.$#"
+			path: src/pocketmine
+
+		-
+			message: "#^Constant pocketmine\\\\START_TIME not found\\.$#"
+			path: src/pocketmine
+
+		-
+			message: "#^Constant pocketmine\\\\VERSION not found\\.$#"
+			path: src/pocketmine
+		-
+			message: "#^Used constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
+			path: src/pocketmine/level/format/io/leveldb/LevelDB.php
+			comment: "explicitly checked"
+		-
+			message: "#^Constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
+			path: src/pocketmine/level/format/io/leveldb/LevelDB.php
+			comment: "explicitly checked"
+		-
+			message: "#^Instantiated class LevelDB not found\\.$#"
+			path: src/pocketmine/level/format/io/leveldb/LevelDB.php
+			comment: "leveldb extension currently optional"
+		-
+			message: "#^Return typehint of method pocketmine\\\\level\\\\format\\\\io\\\\leveldb\\\\LevelDB\\:\\:createDB\\(\\) has invalid type LevelDB\\.$#"
+			path: src/pocketmine/level/format/io/leveldb/LevelDB.php
+		-
+			message: "#^Return typehint of method pocketmine\\\\level\\\\format\\\\io\\\\leveldb\\\\LevelDB\\:\\:getDatabase\\(\\) has invalid type LevelDB\\.$#"
+			path: src/pocketmine/level/format/io/leveldb/LevelDB.php

src/pocketmine/GlobalConstants.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+// composer autoload doesn't use require_once and also pthreads can inherit things
+if(defined('pocketmine\_GLOBAL_CONSTANTS_INCLUDED')){
+	return;
+}
+define('pocketmine\_GLOBAL_CONSTANTS_INCLUDED', true);
+
+const INT32_MIN = -0x80000000;
+const INT32_MAX = 0x7fffffff;
+define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);

src/pocketmine/PocketMine.php

@@ -21,11 +21,6 @@
 
 declare(strict_types=1);
 
-namespace {
-	const INT32_MIN = -0x80000000;
-	const INT32_MAX = 0x7fffffff;
-}
-
 namespace pocketmine {
 
 	use pocketmine\utils\MainLogger;
@@ -160,7 +155,6 @@ namespace pocketmine {
 
 		error_reporting(-1);
 		set_ini_entries();
-		@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
 
 		if(\Phar::running(true) !== ""){
 			define('pocketmine\PATH', \Phar::running(true) . "/");

src/pocketmine/VersionInfo.php

@@ -21,6 +21,14 @@
 
 namespace pocketmine;
 
+// composer autoload doesn't use require_once and also pthreads can inherit things
+// TODO: drop this file and use a final class with constants
+if(defined('pocketmine\_VERSION_INFO_INCLUDED')){
+	return;
+}
+const _VERSION_INFO_INCLUDED = true;
+
+
 const NAME = "PocketMine-MP";
 const BASE_VERSION = "3.9.8";
 const IS_DEVELOPMENT_BUILD = true;

src/pocketmine/entity/object/Painting.php

@@ -90,6 +90,9 @@ class Painting extends Entity{
 	}
 
 	public function kill() : void{
+		if(!$this->isAlive()){
+			return;
+		}
 		parent::kill();
 
 		$drops = true;

tests/travis.sh

@@ -21,7 +21,11 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-curl https://phar.phpunit.de/phpunit-7.phar --silent --location -o phpunit.phar
+[ ! -f phpstan.phar ] && echo "Downloading PHPStan..." && curl -sSLO https://github.com/phpstan/phpstan/releases/download/0.11.19/phpstan.phar
+"$PHP_BINARY" phpstan.phar analyze --no-progress --memory-limit=2G || exit 1
+echo "PHPStan scan succeeded"
+
+[ ! -f phpunit.phar ] && echo "Downloading PHPUnit..." && curl https://phar.phpunit.de/phpunit-7.phar --silent --location -o phpunit.phar
 "$PHP_BINARY" phpunit.phar --bootstrap vendor/autoload.php --fail-on-warning tests/phpunit || exit 1
 
 #Run-the-server tests