Merge remote-tracking branch 'origin/stable' into drew-1.13

.travis.yml

@@ -9,7 +9,7 @@ before_script:
  - echo | pecl install channel://pecl.php.net/yaml-2.0.4
  - 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 8666ae5add7a8b5213d68b491ebf0de211998cc9
+Subproject commit 185d7419914005530298bd5e069449bdf4c0be56

phpstan.neon

@@ -2,6 +2,9 @@
 
 parameters:
 	level: 1
+	autoload_files:
+		- tests/phpstan/bootstrap.php
+		- src/pocketmine/PocketMine.php
 	paths:
 		- src
 	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
@@ -10,61 +13,6 @@ parameters:
 			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

src/pocketmine/PocketMine.php

@@ -291,5 +291,7 @@ namespace pocketmine {
 		exit($exitCode);
 	}
 
-	\pocketmine\server();
+	if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
+		\pocketmine\server();
+	}
 }

src/pocketmine/network/mcpe/NetworkBinaryStream.php

@@ -437,7 +437,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);