From eeee1fbe73509febf6e240b497b1d4d5d9b1b3d3 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 4 Aug 2020 11:32:25 +0100 Subject: [PATCH 01/15] Updated composer dependencies --- composer.lock | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/composer.lock b/composer.lock index 74db26a7b..faf894cec 100644 --- a/composer.lock +++ b/composer.lock @@ -750,28 +750,27 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.1.0", + "version": "5.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e" + "reference": "3170448f5769fe19f456173d833734e0ff1b84df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", - "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/3170448f5769fe19f456173d833734e0ff1b84df", + "reference": "3170448f5769fe19f456173d833734e0ff1b84df", "shasum": "" }, "require": { - "ext-filter": "^7.1", - "php": "^7.2", - "phpdocumentor/reflection-common": "^2.0", - "phpdocumentor/type-resolver": "^1.0", - "webmozart/assert": "^1" + "ext-filter": "*", + "php": "^7.2 || ^8.0", + "phpdocumentor/reflection-common": "^2.2", + "phpdocumentor/type-resolver": "^1.3", + "webmozart/assert": "^1.9.1" }, "require-dev": { - "doctrine/instantiator": "^1", - "mockery/mockery": "^1" + "mockery/mockery": "~1.3.2" }, "type": "library", "extra": { @@ -799,7 +798,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-02-22T12:28:44+00:00" + "time": "2020-07-20T20:05:34+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1369,16 +1368,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "4.0.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374" + "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5672711b6b07b14d5ab694e700c62eeb82fcf374", - "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3", + "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3", "shasum": "" }, "require": { @@ -1420,7 +1419,7 @@ "type": "github" } ], - "time": "2020-06-27T06:36:25+00:00" + "time": "2020-08-04T08:28:15+00:00" }, { "name": "phpunit/phpunit", @@ -2258,16 +2257,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.17.1", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", - "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", "shasum": "" }, "require": { @@ -2279,7 +2278,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2330,7 +2329,7 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "theseer/tokenizer", From 0766952f3921f84fe15ef9269a262cac6b645e0f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 4 Aug 2020 11:38:00 +0100 Subject: [PATCH 02/15] FINALLY, a usable new build of phpstan --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 725fc3ad1..8e9c3174e 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "ocramius/package-versions": "^1.5" }, "require-dev": { - "phpstan/phpstan": "0.12.29", + "phpstan/phpstan": "0.12.35", "phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.2", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index faf894cec..6186b4135 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ad95d8209e2a57c785c095705ff89f8c", + "content-hash": "c833958d2619a660331c0edc8ba5fd6e", "packages": [ { "name": "adhocore/json-comment", @@ -910,20 +910,20 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.29", + "version": "0.12.35", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "9771daaf6b95c6313b908d0bcdee0afcd51f838a" + "reference": "5230eb31d546e4df7aa725894d17436cb8afd5df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9771daaf6b95c6313b908d0bcdee0afcd51f838a", - "reference": "9771daaf6b95c6313b908d0bcdee0afcd51f838a", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5230eb31d546e4df7aa725894d17436cb8afd5df", + "reference": "5230eb31d546e4df7aa725894d17436cb8afd5df", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -962,7 +962,7 @@ "type": "tidelift" } ], - "time": "2020-06-14T14:10:59+00:00" + "time": "2020-08-04T09:48:39+00:00" }, { "name": "phpstan/phpstan-phpunit", From 8da7e789fd05165ca0e0f06e25108f9033cbfa25 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 4 Aug 2020 16:55:47 +0100 Subject: [PATCH 03/15] LoginPacket: protocol cannot be NULL --- src/pocketmine/Player.php | 2 +- src/pocketmine/network/mcpe/protocol/LoginPacket.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index dac971741..b80a4d496 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1898,7 +1898,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ } //This pocketmine disconnect message will only be seen by the console (PlayStatusPacket causes the messages to be shown for the client) - $this->close("", $this->server->getLanguage()->translateString("pocketmine.disconnect.incompatibleProtocol", [$packet->protocol ?? "unknown"]), false); + $this->close("", $this->server->getLanguage()->translateString("pocketmine.disconnect.incompatibleProtocol", [$packet->protocol]), false); return true; } diff --git a/src/pocketmine/network/mcpe/protocol/LoginPacket.php b/src/pocketmine/network/mcpe/protocol/LoginPacket.php index 836ed7e97..e27aaa771 100644 --- a/src/pocketmine/network/mcpe/protocol/LoginPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LoginPacket.php @@ -78,7 +78,7 @@ class LoginPacket extends DataPacket{ } public function mayHaveUnreadBytes() : bool{ - return $this->protocol !== null and $this->protocol !== ProtocolInfo::CURRENT_PROTOCOL; + return $this->protocol !== ProtocolInfo::CURRENT_PROTOCOL; } protected function decodePayload(){ @@ -92,7 +92,7 @@ class LoginPacket extends DataPacket{ } $logger = MainLogger::getLogger(); - $logger->debug(get_class($e) . " was thrown while decoding connection request in login (protocol version " . ($this->protocol ?? "unknown") . "): " . $e->getMessage()); + $logger->debug(get_class($e) . " was thrown while decoding connection request in login (protocol version $this->protocol): " . $e->getMessage()); foreach(Utils::printableTrace($e->getTrace()) as $line){ $logger->debug($line); } From 3f89bd7bfff17a7053c1bebf882a8d41704afc29 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 4 Aug 2020 16:58:27 +0100 Subject: [PATCH 04/15] TaskHandler->getOwnerName() never returns NULL --- src/pocketmine/timings/Timings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/timings/Timings.php b/src/pocketmine/timings/Timings.php index ce046a9dd..a234d5024 100644 --- a/src/pocketmine/timings/Timings.php +++ b/src/pocketmine/timings/Timings.php @@ -149,7 +149,7 @@ abstract class Timings{ } public static function getScheduledTaskTimings(TaskHandler $task, int $period) : TimingsHandler{ - $name = "Task: " . ($task->getOwnerName() ?? "Unknown") . " Runnable: " . $task->getTaskName(); + $name = "Task: " . $task->getOwnerName() . " Runnable: " . $task->getTaskName(); if($period > 0){ $name .= "(interval:" . $period . ")"; From e238d583b85d9c1f4046b3b818d27fb9e6f9fb52 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2020 10:38:00 +0000 Subject: [PATCH 05/15] Bump phpstan/phpstan-strict-rules from 0.12.3 to 0.12.4 (#3748) --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 6186b4135..cbcab5052 100644 --- a/composer.lock +++ b/composer.lock @@ -1022,21 +1022,21 @@ }, { "name": "phpstan/phpstan-strict-rules", - "version": "0.12.3", + "version": "0.12.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-strict-rules.git", - "reference": "937283265620af9e2005743134ebb4e197b12d8e" + "reference": "9b86e1eb77c796628e239820a01a2d327d607a5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/937283265620af9e2005743134ebb4e197b12d8e", - "reference": "937283265620af9e2005743134ebb4e197b12d8e", + "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/9b86e1eb77c796628e239820a01a2d327d607a5e", + "reference": "9b86e1eb77c796628e239820a01a2d327d607a5e", "shasum": "" }, "require": { - "php": "~7.1", - "phpstan/phpstan": "^0.12.6" + "php": "^7.1 || ^8.0", + "phpstan/phpstan": "^0.12.33" }, "require-dev": { "consistence/coding-standard": "^3.0.1", @@ -1069,7 +1069,7 @@ "MIT" ], "description": "Extra strict and opinionated rules for PHPStan", - "time": "2020-07-16T08:58:37+00:00" + "time": "2020-07-21T14:49:47+00:00" }, { "name": "phpunit/php-code-coverage", From 809dad2ac8ba2d54d7acf451177dd4808b49c71c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2020 10:39:53 +0000 Subject: [PATCH 06/15] Bump phpstan/phpstan-phpunit from 0.12.11 to 0.12.15 Bumps [phpstan/phpstan-phpunit](https://github.com/phpstan/phpstan-phpunit) from 0.12.11 to 0.12.15. - [Release notes](https://github.com/phpstan/phpstan-phpunit/releases) - [Commits](https://github.com/phpstan/phpstan-phpunit/compare/0.12.11...0.12.15) Signed-off-by: dependabot-preview[bot] --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index cbcab5052..0026601ae 100644 --- a/composer.lock +++ b/composer.lock @@ -966,28 +966,28 @@ }, { "name": "phpstan/phpstan-phpunit", - "version": "0.12.11", + "version": "0.12.15", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "ab783a8ea634ea23305a8818c4750603e714489b" + "reference": "264abf4c789118c63389bb8009e3418f7cd5fbbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/ab783a8ea634ea23305a8818c4750603e714489b", - "reference": "ab783a8ea634ea23305a8818c4750603e714489b", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/264abf4c789118c63389bb8009e3418f7cd5fbbd", + "reference": "264abf4c789118c63389bb8009e3418f7cd5fbbd", "shasum": "" }, "require": { - "php": "~7.1", - "phpstan/phpstan": "^0.12.20" + "php": "^7.1 || ^8.0", + "phpstan/phpstan": "^0.12.33" }, "conflict": { "phpunit/phpunit": "<7.0" }, "require-dev": { "consistence/coding-standard": "^3.5", - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "ergebnis/composer-normalize": "^2.0.2", "jakub-onderka/php-parallel-lint": "^1.0", "phing/phing": "^2.16.0", @@ -1018,7 +1018,7 @@ "MIT" ], "description": "PHPUnit extensions and rules for PHPStan", - "time": "2020-06-01T16:43:31+00:00" + "time": "2020-07-29T20:54:30+00:00" }, { "name": "phpstan/phpstan-strict-rules", From 4e29b216bfeb6e36783428381360b9b36a30989f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2020 18:12:12 +0000 Subject: [PATCH 07/15] Bump phpstan/phpstan from 0.12.35 to 0.12.36 (#3752) --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 8e9c3174e..8e14dff81 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "ocramius/package-versions": "^1.5" }, "require-dev": { - "phpstan/phpstan": "0.12.35", + "phpstan/phpstan": "0.12.36", "phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.2", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index 0026601ae..b69b134a3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c833958d2619a660331c0edc8ba5fd6e", + "content-hash": "b1129fbf37136eacf27cafa0b15f814a", "packages": [ { "name": "adhocore/json-comment", @@ -910,16 +910,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.35", + "version": "0.12.36", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "5230eb31d546e4df7aa725894d17436cb8afd5df" + "reference": "eaeff985e395ff4e7aebf3251a43fca6c9be1af3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5230eb31d546e4df7aa725894d17436cb8afd5df", - "reference": "5230eb31d546e4df7aa725894d17436cb8afd5df", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/eaeff985e395ff4e7aebf3251a43fca6c9be1af3", + "reference": "eaeff985e395ff4e7aebf3251a43fca6c9be1af3", "shasum": "" }, "require": { @@ -962,7 +962,7 @@ "type": "tidelift" } ], - "time": "2020-08-04T09:48:39+00:00" + "time": "2020-08-05T09:29:40+00:00" }, { "name": "phpstan/phpstan-phpunit", From 1ff3df6ff037ea3239a459f7dec5f05a02f3f9e0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2020 19:49:04 +0000 Subject: [PATCH 08/15] Bump phpstan/phpstan-phpunit from 0.12.15 to 0.12.16 (#3753) --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index b69b134a3..d9514773f 100644 --- a/composer.lock +++ b/composer.lock @@ -966,16 +966,16 @@ }, { "name": "phpstan/phpstan-phpunit", - "version": "0.12.15", + "version": "0.12.16", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "264abf4c789118c63389bb8009e3418f7cd5fbbd" + "reference": "1dd916d181b0539dea5cd37e91546afb8b107e17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/264abf4c789118c63389bb8009e3418f7cd5fbbd", - "reference": "264abf4c789118c63389bb8009e3418f7cd5fbbd", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/1dd916d181b0539dea5cd37e91546afb8b107e17", + "reference": "1dd916d181b0539dea5cd37e91546afb8b107e17", "shasum": "" }, "require": { @@ -1018,7 +1018,7 @@ "MIT" ], "description": "PHPUnit extensions and rules for PHPStan", - "time": "2020-07-29T20:54:30+00:00" + "time": "2020-08-05T13:28:50+00:00" }, { "name": "phpstan/phpstan-strict-rules", From ac3bba0a1144df91d2a5e446198730f01c5ffbfb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 7 Aug 2020 15:38:57 +0000 Subject: [PATCH 09/15] Bump phpunit/phpunit from 9.2.6 to 9.3.2 (#3758) --- composer.lock | 349 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 231 insertions(+), 118 deletions(-) diff --git a/composer.lock b/composer.lock index d9514773f..d0018532a 100644 --- a/composer.lock +++ b/composer.lock @@ -598,29 +598,82 @@ "time": "2020-06-29T13:22:24+00:00" }, { - "name": "phar-io/manifest", - "version": "1.0.3", + "name": "nikic/php-parser", + "version": "v4.7.0", "source": { "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", + "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "0.0.5", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.7-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2020-07-25T13:18:53+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", + "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", "shasum": "" }, "require": { "ext-dom": "*", "ext-phar": "*", - "phar-io/version": "^2.0", - "php": "^5.6 || ^7.0" + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -650,24 +703,24 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2018-07-08T19:23:20+00:00" + "time": "2020-06-27T14:33:11+00:00" }, { "name": "phar-io/version", - "version": "2.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + "reference": "c6bb6825def89e0a32220f88337f8ceaf1975fa0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "url": "https://api.github.com/repos/phar-io/version/zipball/c6bb6825def89e0a32220f88337f8ceaf1975fa0", + "reference": "c6bb6825def89e0a32220f88337f8ceaf1975fa0", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -697,7 +750,7 @@ } ], "description": "Library for handling version information and constraints", - "time": "2018-07-08T19:19:57+00:00" + "time": "2020-06-27T14:39:04+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -1073,32 +1126,35 @@ }, { "name": "phpunit/php-code-coverage", - "version": "8.0.2", + "version": "9.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc" + "reference": "ee24e82baca11d7d6fb3513e127d6000f541cf90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca6647ffddd2add025ab3f21644a441d7c146cdc", - "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ee24e82baca11d7d6fb3513e127d6000f541cf90", + "reference": "ee24e82baca11d7d6fb3513e127d6000f541cf90", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-xmlwriter": "*", - "php": "^7.3", - "phpunit/php-file-iterator": "^3.0", - "phpunit/php-text-template": "^2.0", - "phpunit/php-token-stream": "^4.0", - "sebastian/code-unit-reverse-lookup": "^2.0", - "sebastian/environment": "^5.0", - "sebastian/version": "^3.0", - "theseer/tokenizer": "^1.1.3" + "nikic/php-parser": "^4.7", + "php": "^7.3 || ^8.0", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^9.0" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-pcov": "*", @@ -1107,7 +1163,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.0-dev" + "dev-master": "9.0-dev" } }, "autoload": { @@ -1139,7 +1195,7 @@ "type": "github" } ], - "time": "2020-05-23T08:02:54+00:00" + "time": "2020-08-07T04:12:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1199,16 +1255,16 @@ }, { "name": "phpunit/php-invoker", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66" + "reference": "7a85b66acc48cacffdf87dadd3694e7123674298" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f6eedfed1085dd1f4c599629459a0277d25f9a66", - "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7a85b66acc48cacffdf87dadd3694e7123674298", + "reference": "7a85b66acc48cacffdf87dadd3694e7123674298", "shasum": "" }, "require": { @@ -1224,7 +1280,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1254,7 +1310,7 @@ "type": "github" } ], - "time": "2020-06-26T11:53:53+00:00" + "time": "2020-08-06T07:04:15+00:00" }, { "name": "phpunit/php-text-template", @@ -1366,73 +1422,18 @@ ], "time": "2020-06-26T11:58:13+00:00" }, - { - "name": "phpunit/php-token-stream", - "version": "4.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": "^7.3 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-08-04T08:28:15+00:00" - }, { "name": "phpunit/phpunit", - "version": "9.2.6", + "version": "9.3.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "1c6a9e4312e209e659f1fce3ce88dd197c2448f6" + "reference": "eacb57f3857cb6706550bd39ea500f9b1097b0bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1c6a9e4312e209e659f1fce3ce88dd197c2448f6", - "reference": "1c6a9e4312e209e659f1fce3ce88dd197c2448f6", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/eacb57f3857cb6706550bd39ea500f9b1097b0bf", + "reference": "eacb57f3857cb6706550bd39ea500f9b1097b0bf", "shasum": "" }, "require": { @@ -1443,30 +1444,30 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.9.5", - "phar-io/manifest": "^1.0.3", - "phar-io/version": "^2.0.1", - "php": "^7.3", - "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^8.0.2", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-invoker": "^3.0.2", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.1", + "phar-io/version": "^3.0.2", + "php": "^7.3 || ^8.0", + "phpspec/prophecy": "^1.11.1", + "phpunit/php-code-coverage": "^9.0", + "phpunit/php-file-iterator": "^3.0.4", + "phpunit/php-invoker": "^3.1", "phpunit/php-text-template": "^2.0.2", "phpunit/php-timer": "^5.0.1", "sebastian/code-unit": "^1.0.5", "sebastian/comparator": "^4.0.3", - "sebastian/diff": "^4.0.1", + "sebastian/diff": "^4.0.2", "sebastian/environment": "^5.1.2", "sebastian/exporter": "^4.0.2", - "sebastian/global-state": "^4.0", + "sebastian/global-state": "^5.0", "sebastian/object-enumerator": "^4.0.2", "sebastian/resource-operations": "^3.0.2", - "sebastian/type": "^2.1.1", + "sebastian/type": "^2.2.1", "sebastian/version": "^3.0.1" }, "require-dev": { "ext-pdo": "*", - "phpspec/prophecy-phpunit": "^2.0" + "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { "ext-soap": "*", @@ -1478,7 +1479,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-master": "9.3-dev" } }, "autoload": { @@ -1517,7 +1518,7 @@ "type": "github" } ], - "time": "2020-07-13T17:55:55+00:00" + "time": "2020-08-07T09:12:30+00:00" }, { "name": "sebastian/code-unit", @@ -1692,6 +1693,59 @@ ], "time": "2020-06-26T12:05:46+00:00" }, + { + "name": "sebastian/complexity", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "33fcd6a26656c6546f70871244ecba4b4dced097" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/33fcd6a26656c6546f70871244ecba4b4dced097", + "reference": "33fcd6a26656c6546f70871244ecba4b4dced097", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.7", + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-07-25T14:01:34+00:00" + }, { "name": "sebastian/diff", "version": "4.0.2", @@ -1888,26 +1942,26 @@ }, { "name": "sebastian/global-state", - "version": "4.0.0", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72" + "reference": "22ae663c951bdc39da96603edc3239ed3a299097" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bdb1e7c79e592b8c82cb1699be3c8743119b8a72", - "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/22ae663c951bdc39da96603edc3239ed3a299097", + "reference": "22ae663c951bdc39da96603edc3239ed3a299097", "shasum": "" }, "require": { - "php": "^7.3", + "php": "^7.3 || ^8.0", "sebastian/object-reflector": "^2.0", "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^9.0" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-uopz": "*" @@ -1915,7 +1969,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1938,7 +1992,66 @@ "keywords": [ "global state" ], - "time": "2020-02-07T06:11:37+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-08-07T04:09:03+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "e02bf626f404b5daec382a7b8a6a4456e49017e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e02bf626f404b5daec382a7b8a6a4456e49017e5", + "reference": "e02bf626f404b5daec382a7b8a6a4456e49017e5", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.6", + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-07-22T18:33:42+00:00" }, { "name": "sebastian/object-enumerator", From 63f57841de44f1dfe3f707116ab8825e98395291 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 7 Aug 2020 19:50:49 +0100 Subject: [PATCH 10/15] PlayerAuthInputPacket: fixed yaw/pitch being the wrong way round, closes #3757 --- .../network/mcpe/protocol/PlayerAuthInputPacket.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/network/mcpe/protocol/PlayerAuthInputPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerAuthInputPacket.php index 13acf5c72..e8900dd7f 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerAuthInputPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerAuthInputPacket.php @@ -128,8 +128,8 @@ class PlayerAuthInputPacket extends DataPacket/* implements ServerboundPacket*/{ } protected function decodePayload() : void{ - $this->yaw = $this->getLFloat(); $this->pitch = $this->getLFloat(); + $this->yaw = $this->getLFloat(); $this->position = $this->getVector3(); $this->moveVecX = $this->getLFloat(); $this->moveVecZ = $this->getLFloat(); @@ -143,8 +143,8 @@ class PlayerAuthInputPacket extends DataPacket/* implements ServerboundPacket*/{ } protected function encodePayload() : void{ - $this->putLFloat($this->yaw); $this->putLFloat($this->pitch); + $this->putLFloat($this->yaw); $this->putVector3($this->position); $this->putLFloat($this->moveVecX); $this->putLFloat($this->moveVecZ); From e369966890f30fe24de7485cc9cf2eba077cdfa4 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 7 Aug 2020 20:00:12 +0100 Subject: [PATCH 11/15] updated composer.lock --- composer.lock | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/composer.lock b/composer.lock index d0018532a..4cc6e3bf9 100644 --- a/composer.lock +++ b/composer.lock @@ -527,20 +527,6 @@ "constructor", "instantiate" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], "time": "2020-05-29T17:27:14+00:00" }, { From 50101663f2819201a70faaf3fb22e0e7e9021d5a Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 10 Aug 2020 17:25:48 +0100 Subject: [PATCH 12/15] Use the up-to-date git submodule urls --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b7ed9bf64..a760aa3a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "src/pocketmine/lang/locale"] path = src/pocketmine/lang/locale - url = https://github.com/pmmp/PocketMine-Language.git + url = https://github.com/pmmp/Language.git [submodule "tests/preprocessor"] path = build/preprocessor url = https://github.com/pmmp/preprocessor.git [submodule "tests/plugins/PocketMine-DevTools"] path = tests/plugins/PocketMine-DevTools - url = https://github.com/pmmp/PocketMine-DevTools.git + url = https://github.com/pmmp/DevTools.git [submodule "build/php"] path = build/php url = https://github.com/pmmp/php-build-scripts.git From 691d92a9597db7a8e9a7b4ad81c8b7a9627bc3fc Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 10 Aug 2020 17:29:44 +0100 Subject: [PATCH 13/15] moved tests/plugins/PocketMine-DevTools -> tests/plugins/DevTools --- .gitmodules | 4 ++-- tests/plugins/{PocketMine-DevTools => DevTools} | 0 tests/travis.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename tests/plugins/{PocketMine-DevTools => DevTools} (100%) diff --git a/.gitmodules b/.gitmodules index a760aa3a4..28cc4692d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ [submodule "tests/preprocessor"] path = build/preprocessor url = https://github.com/pmmp/preprocessor.git -[submodule "tests/plugins/PocketMine-DevTools"] - path = tests/plugins/PocketMine-DevTools +[submodule "tests/plugins/DevTools"] + path = tests/plugins/DevTools url = https://github.com/pmmp/DevTools.git [submodule "build/php"] path = build/php diff --git a/tests/plugins/PocketMine-DevTools b/tests/plugins/DevTools similarity index 100% rename from tests/plugins/PocketMine-DevTools rename to tests/plugins/DevTools diff --git a/tests/travis.sh b/tests/travis.sh index 3259be303..149c1896a 100755 --- a/tests/travis.sh +++ b/tests/travis.sh @@ -17,7 +17,7 @@ PLUGINS_DIR="$DATA_DIR/plugins" rm -rf "$DATA_DIR" rm PocketMine-MP.phar 2> /dev/null -cd tests/plugins/PocketMine-DevTools +cd tests/plugins/DevTools php -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out ../../../DevTools.phar cd ../../.. From aaa23361d131691812e7e2f9159ffb63299ea8cb Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 10 Aug 2020 17:32:09 +0100 Subject: [PATCH 14/15] updated devtools links --- README.md | 2 +- doxygen/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9a98e3dae..c36a65cef 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ ## For developers * [Building and running from source](BUILDING.md) * [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP-doc/doxygen/) - Doxygen documentation generated from development - * [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins + * [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins * [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features * [Contributing Guidelines](CONTRIBUTING.md) diff --git a/doxygen/index.md b/doxygen/index.md index 14b0fbe48..357c82504 100644 --- a/doxygen/index.md +++ b/doxygen/index.md @@ -5,6 +5,6 @@ This site contains auto-generated API documentation for PocketMine-MP (and depen This site can be accessed via https://apidoc.pmmp.io. ### Additional developer resources - - [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins + - [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins - [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features - [DeveloperDocs](https://github.com/pmmp/DeveloperDocs/) - Reference, guides and specifications for the PocketMine-MP API From 9bd6d5c67e0ba1d5599ac027f10bb6b86a354489 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 10 Aug 2020 17:45:06 +0100 Subject: [PATCH 15/15] Updated travis pthreads to pmmp/pthreads@45579e1e622acd80f9c880f3a025ba3b98b8ebef --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e8d845709..fa7469346 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_script: - echo | pecl install channel://pecl.php.net/yaml-2.1.0 - git clone https://github.com/pmmp/pthreads.git - cd pthreads - - git checkout 646dac62ae0d48c1ada7b007e15575fb84f7d71d + - git checkout 45579e1e622acd80f9c880f3a025ba3b98b8ebef - phpize - ./configure - make