mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-06 20:07:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-06-18 18:52:04 +01:00
commit 735c656f9d
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
5 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
changelogs/3.21.md Normal file
View File

@ -0,0 +1,11 @@
**For Minecraft: Bedrock Edition 1.17.0**
### Note about API versions
Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
Plugin developers should **only** update their required API to this version if you need the changes in this build.
**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
# 3.21.0
- PHP 7.4 is now required as a minimum.
- A workaround for player movement added in 1.14.30 has been removed.

2
composer.json
View File

@ -51,7 +51,7 @@
"respect/validation": "^2.0" "respect/validation": "^2.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.89", "phpstan/phpstan": "0.12.90",
"phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2", "phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2" "phpunit/phpunit": "^9.2"

41
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b686b4b92fc44feb5f5ba22a5388afd2", "content-hash": "1ec8a08d7688ec903c9b67945feab26e",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1834,16 +1834,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.89", "version": "0.12.90",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "54c0f5a6c30511b77128d58b6369f718df250542" "reference": "f0e4b56630fc3d4eb5be86606d07212ac212ede4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/54c0f5a6c30511b77128d58b6369f718df250542", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f0e4b56630fc3d4eb5be86606d07212ac212ede4",
"reference": "54c0f5a6c30511b77128d58b6369f718df250542", "reference": "f0e4b56630fc3d4eb5be86606d07212ac212ede4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1874,7 +1874,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.89" "source": "https://github.com/phpstan/phpstan/tree/0.12.90"
}, },
"funding": [ "funding": [
{ {
@ -1894,20 +1894,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-06-09T20:23:49+00:00" "time": "2021-06-18T07:15:38+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",
"version": "0.12.19", "version": "0.12.20",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git", "url": "https://github.com/phpstan/phpstan-phpunit.git",
"reference": "52f7072ddc5f81492f9d2de65a24813a48c90b18" "reference": "efc009981af383eb3303f0ca9868c29acad7ce74"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/52f7072ddc5f81492f9d2de65a24813a48c90b18", "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/efc009981af383eb3303f0ca9868c29acad7ce74",
"reference": "52f7072ddc5f81492f9d2de65a24813a48c90b18", "reference": "efc009981af383eb3303f0ca9868c29acad7ce74",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1918,10 +1918,9 @@
"phpunit/phpunit": "<7.0" "phpunit/phpunit": "<7.0"
}, },
"require-dev": { "require-dev": {
"phing/phing": "^2.16.3",
"php-parallel-lint/php-parallel-lint": "^1.2", "php-parallel-lint/php-parallel-lint": "^1.2",
"phpstan/phpstan-strict-rules": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.6",
"phpunit/phpunit": "^7.5.20" "phpunit/phpunit": "^9.5"
}, },
"type": "phpstan-extension", "type": "phpstan-extension",
"extra": { "extra": {
@ -1947,9 +1946,9 @@
"description": "PHPUnit extensions and rules for PHPStan", "description": "PHPUnit extensions and rules for PHPStan",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues", "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
"source": "https://github.com/phpstan/phpstan-phpunit/tree/0.12.19" "source": "https://github.com/phpstan/phpstan-phpunit/tree/0.12.20"
}, },
"time": "2021-04-30T11:10:37+00:00" "time": "2021-06-17T08:28:30+00:00"
}, },
{ {
"name": "phpstan/phpstan-strict-rules", "name": "phpstan/phpstan-strict-rules",
@ -3280,16 +3279,16 @@
}, },
{ {
"name": "sebastian/type", "name": "sebastian/type",
"version": "2.3.2", "version": "2.3.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/type.git", "url": "https://github.com/sebastianbergmann/type.git",
"reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1" "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0d1c587401514d17e8f9258a27e23527cb1b06c1", "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
"reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1", "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3324,7 +3323,7 @@
"homepage": "https://github.com/sebastianbergmann/type", "homepage": "https://github.com/sebastianbergmann/type",
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/type/issues", "issues": "https://github.com/sebastianbergmann/type/issues",
"source": "https://github.com/sebastianbergmann/type/tree/2.3.2" "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
}, },
"funding": [ "funding": [
{ {
@ -3332,7 +3331,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-06-04T13:02:07+00:00" "time": "2021-06-15T12:49:02+00:00"
}, },
{ {
"name": "sebastian/version", "name": "sebastian/version",

6
src/CrashDump.php
View File

@ -46,6 +46,7 @@ use function is_dir;
use function is_resource; use function is_resource;
use function json_encode; use function json_encode;
use function json_last_error_msg; use function json_last_error_msg;
use function ksort;
use function max; use function max;
use function mb_strtoupper; use function mb_strtoupper;
use function microtime; use function microtime;
@ -67,6 +68,7 @@ use const FILE_IGNORE_NEW_LINES;
use const JSON_UNESCAPED_SLASHES; use const JSON_UNESCAPED_SLASHES;
use const PHP_EOL; use const PHP_EOL;
use const PHP_OS; use const PHP_OS;
use const SORT_STRING;
class CrashDump{ class CrashDump{
@ -165,7 +167,9 @@ class CrashDump{
$this->addLine(); $this->addLine();
$this->addLine("Loaded plugins:"); $this->addLine("Loaded plugins:");
$this->data["plugins"] = []; $this->data["plugins"] = [];
foreach($this->server->getPluginManager()->getPlugins() as $p){ $plugins = $this->server->getPluginManager()->getPlugins();
ksort($plugins, SORT_STRING);
foreach($plugins as $p){
$d = $p->getDescription(); $d = $p->getDescription();
$this->data["plugins"][$d->getName()] = [ $this->data["plugins"][$d->getName()] = [
"name" => $d->getName(), "name" => $d->getName(),

2
tests/phpstan/configs/check-explicit-mixed-baseline.neon
View File

@ -1,7 +1,7 @@
parameters: parameters:
ignoreErrors: ignoreErrors:
- -
message: "#^Cannot access offset float\\|int on mixed\\.$#" message: "#^Cannot access offset \\(float\\|int\\) on mixed\\.$#"
count: 1 count: 1
path: ../../../src/CrashDump.php path: ../../../src/CrashDump.php