Merge branch 'stable' with changes

.travis.yml

@@ -29,7 +29,7 @@ before_script:
  - pecl install channel://pecl.php.net/igbinary-3.0.1
  - git clone https://github.com/pmmp/pthreads.git
  - cd pthreads
- - git checkout 6ca019c58b4fa09ee2ff490f2444e34bef0773d0
+ - git checkout 1b7da492b944146fa9680f6399bd9c6c6c6095e0
  - phpize
  - ./configure
  - make

build/php

@@ -1 +1 @@
-Subproject commit 09362df531490e12997a7f3f84564572614f22d8
+Subproject commit bdcc3af3d038c7ac9881f05da88ea28f19e881be

changelogs/3.9.md

@@ -99,4 +99,9 @@ Plugin developers should **only** update their required API to this version if y
   - `pocketmine\level\Explosion`:
     - `explodeA()`
     - `explodeB()`
-- Fixed various cosmetic documentation inconsistencies in the core and dependencies.
+- Fixed various cosmetic documentation inconsistencies in the core and dependencies.
+
+# 3.9.7
+- Fixed a crash that could occur during timezone detection.
+- Squid no longer spin around constantly in enclosed spaces. Their performance impact is reduced.
+- Cleaned up the bootstrap file.

composer.json

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

phpstan.neon

@@ -0,0 +1,135 @@
+
+
+parameters:
+	level: 1
+	autoload_files:
+		- tests/phpstan/bootstrap.php
+		- src/PocketMine.php
+	paths:
+		- src
+	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
+	ignoreErrors:
+		-
+			message: "#^Function parallel\\\\bootstrap not found\\.$#"
+			count: 1
+			path: src/PocketMine.php
+
+		-
+			message: "#^pocketmine\\\\Player\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\entity\\\\Human\\.$#"
+			path: src/Player.php
+
+		-
+			message: "#^pocketmine\\\\block\\\\[A-Za-z\\d]+\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\block\\\\Block\\.$#"
+			path: src/block
+
+		-
+			message: "#^pocketmine\\\\block\\\\Block\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\level\\\\Position\\.$#"
+			count: 1
+			path: src/block/Block.php
+
+		-
+			message: "#^pocketmine\\\\inventory\\\\DoubleChestInventory\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\inventory\\\\ChestInventory\\.$#"
+			count: 1
+			path: src/inventory/DoubleChestInventory.php
+
+		-
+			message: "#^pocketmine\\\\inventory\\\\EnderChestInventory\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\inventory\\\\ChestInventory\\.$#"
+			count: 1
+			path: src/inventory/EnderChestInventory.php
+
+		-
+			message: "#^pocketmine\\\\item\\\\GoldenAppleEnchanted\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\item\\\\GoldenApple\\.$#"
+			count: 1
+			path: src/item/GoldenAppleEnchanted.php
+
+		-
+			message: "#^pocketmine\\\\item\\\\WrittenBook\\:\\:__construct\\(\\) does not call parent constructor from pocketmine\\\\item\\\\WritableBook\\.$#"
+			count: 1
+			path: src/item/WrittenBook.php
+
+		-
+			message: "#^Constructor of class pocketmine\\\\level\\\\generator\\\\hell\\\\Nether has an unused parameter \\$options\\.$#"
+			count: 1
+			path: src/level/generator/hell/Nether.php
+
+		-
+			message: "#^Constructor of class pocketmine\\\\level\\\\generator\\\\normal\\\\Normal has an unused parameter \\$options\\.$#"
+			count: 1
+			path: src/level/generator/normal/Normal.php
+
+		-
+			message: "#^Used constant pocketmine\\\\RESOURCE_PATH not found\\.$#"
+			count: 1
+			path: src/network/mcpe/protocol/StartGamePacket.php
+
+		-
+			message: "#^Instantiated class COM not found\\.$#"
+			count: 2
+			path: src/network/upnp/UPnP.php
+			comment: "only available on Windows"
+
+		-
+			message: "#^Caught class com_exception not found\\.$#"
+			count: 2
+			path: src/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/scheduler/TaskScheduler.php
+
+		-
+			message: "#^Variable \\$GLOBALS in isset\\(\\) always exists and is not nullable\\.$#"
+			path: src/MemoryManager.php
+			comment: "this isn't defined on threads (thanks pthreads)"
+
+		-
+			message: "#^Constant pocketmine\\\\COMPOSER_AUTOLOADER_PATH not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\DATA not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\GIT_COMMIT not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\PATH not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\PLUGIN_PATH not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\RESOURCE_PATH not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\START_TIME not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\VERSION not found\\.$#"
+			path: src
+		-
+			message: "#^Used constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
+			path: src/level/format/io/leveldb/LevelDB.php
+			comment: "explicitly checked"
+		-
+			message: "#^Constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
+			path: src/level/format/io/leveldb/LevelDB.php
+			comment: "explicitly checked"
+		-
+			message: "#^Instantiated class LevelDB not found\\.$#"
+			path: src/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/level/format/io/leveldb/LevelDB.php
+		-
+			message: "#^Return typehint of method pocketmine\\\\level\\\\format\\\\io\\\\leveldb\\\\LevelDB\\:\\:getDatabase\\(\\) has invalid type LevelDB\\.$#"
+			path: src/level/format/io/leveldb/LevelDB.php

src/CrashDump.php

@@ -306,7 +306,7 @@ class CrashDump{
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
 		$this->addLine($this->server->getName() . " version: " . $version->getFullVersion(true) . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "]");
-		$this->addLine("Git commit: " . GIT_COMMIT);
+		$this->addLine("Git commit: " . \pocketmine\GIT_COMMIT);
 		$this->addLine("uname -a: " . php_uname("a"));
 		$this->addLine("PHP Version: " . phpversion());
 		$this->addLine("Zend version: " . zend_version());

src/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.php

@@ -54,18 +54,18 @@ namespace pocketmine {
 		if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
 			//If PHP version isn't high enough, anything below might break, so don't bother checking it.
 			return [
-				\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . "."
+				"PHP >= " . MIN_PHP_VERSION . " is required, but you have PHP " . PHP_VERSION . "."
 			];
 		}
 
 		$messages = [];
 
 		if(PHP_INT_SIZE < 8){
-			$messages[] = "Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported. Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.";
+			$messages[] = "32-bit systems/PHP are no longer supported. Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.";
 		}
 
 		if(php_sapi_name() !== "cli"){
-			$messages[] = "You must run " . \pocketmine\NAME . " using the CLI.";
+			$messages[] = "Only PHP CLI is supported.";
 		}
 
 		$extensions = [
@@ -141,7 +141,6 @@ namespace pocketmine {
 		ini_set("display_errors", '1');
 		ini_set("display_startup_errors", '1');
 		ini_set("default_charset", "utf-8");
-		@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
 		ini_set('assert.exception', '1');
 	}
 
@@ -161,7 +160,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) . "/");
@@ -190,12 +188,6 @@ namespace pocketmine {
 
 		\ErrorUtils::setErrorExceptionHandler();
 
-		/*
-		 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
-		 */
-		$autoloader = new \BaseClassLoader();
-		$autoloader->register(false);
-
 		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
 		define('pocketmine\VERSION', $version->getFullVersion(true));
 
@@ -263,6 +255,12 @@ namespace pocketmine {
 			}
 
 			ThreadManager::init();
+			/*
+			 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
+			 */
+			$autoloader = new \BaseClassLoader();
+			$autoloader->register(false);
+
 			new Server($autoloader, $logger, $dataPath, \pocketmine\PLUGIN_PATH);
 
 			$logger->info("Stopping other threads");
@@ -285,5 +283,7 @@ namespace pocketmine {
 		exit($exitCode);
 	}
 
-	\pocketmine\server();
+	if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
+		\pocketmine\server();
+	}
 }

src/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 = "4.0.0";
 const IS_DEVELOPMENT_BUILD = true;

src/command/CommandReader.php

@@ -142,6 +142,7 @@ class CommandReader extends Thread{
 				case self::TYPE_STREAM:
 					//stream_select doesn't work on piped streams for some reason
 					$r = [self::$stdin];
+					$w = $e = null;
 					if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
 						return true;
 					}elseif($count === false){ //stream error

src/network/mcpe/protocol/types/RuntimeBlockMapping.php

@@ -40,8 +40,8 @@ final class RuntimeBlockMapping{
 	private static $legacyToRuntimeMap = [];
 	/** @var int[] */
 	private static $runtimeToLegacyMap = [];
-	/** @var mixed[] */
-	private static $bedrockKnownStates;
+	/** @var mixed[]|null */
+	private static $bedrockKnownStates = null;
 
 	private function __construct(){
 		//NOOP
@@ -77,6 +77,12 @@ final class RuntimeBlockMapping{
 		}
 	}
 
+	private static function lazyInit() : void{
+		if(self::$bedrockKnownStates === null){
+			self::init();
+		}
+	}
+
 	/**
 	 * Randomizes the order of the runtimeID table to prevent plugins relying on them.
 	 * Plugins shouldn't use this stuff anyway, but plugin devs have an irritating habit of ignoring what they
@@ -101,6 +107,7 @@ final class RuntimeBlockMapping{
 	 * @return int
 	 */
 	public static function toStaticRuntimeId(int $id, int $meta = 0) : int{
+		self::lazyInit();
 		/*
 		 * try id+meta first
 		 * if not found, try id+0 (strip meta)
@@ -115,6 +122,7 @@ final class RuntimeBlockMapping{
 	 * @return int[] [id, meta]
 	 */
 	public static function fromStaticRuntimeId(int $runtimeId) : array{
+		self::lazyInit();
 		$v = self::$runtimeToLegacyMap[$runtimeId];
 		return [$v >> 4, $v & 0xf];
 	}
@@ -128,7 +136,7 @@ final class RuntimeBlockMapping{
 	 * @return array
 	 */
 	public static function getBedrockKnownStates() : array{
+		self::lazyInit();
 		return self::$bedrockKnownStates;
 	}
 }
-RuntimeBlockMapping::init();

src/network/mcpe/serializer/NetworkBinaryStream.php

@@ -362,7 +362,7 @@ class NetworkBinaryStream extends BinaryStream{
 	}
 
 	/**
-	 * Writes an EntityUniqueID
+	 * Writes an EntityRuntimeID
 	 *
 	 * @param int $eid
 	 */

tests/phpstan/bootstrap.php

@@ -0,0 +1,24 @@
+<?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/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+define('pocketmine\_PHPSTAN_ANALYSIS', true);

tests/plugins/PocketMine-DevTools

@@ -1 +1 @@
-Subproject commit e16a36e7dad4230f0e3a9492e17c50357d3d5553
+Subproject commit 39b3e6f288a084124f557801ec33432a96bb9f3d

tests/travis.sh

@@ -21,9 +21,11 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-#Run PHPUnit tests
-#7.5.12 introduces changes that set the build on fire because we don't ship libxml - TODO FIX
-curl https://phar.phpunit.de/phpunit-7.5.11.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