From 29909e7f4458d212b39ba758f5c51d904658ce4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 13:13:51 +0000 Subject: [PATCH 1/5] Bump phpunit/phpunit from 9.5.14 to 9.5.15 (#4859) Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.14 to 9.5.15. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.14...9.5.15) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index a9ab5b189e..5db199d405 100644 --- a/composer.lock +++ b/composer.lock @@ -2071,16 +2071,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.11", + "version": "9.2.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "665a1ac0a763c51afc30d6d130dac0813092b17f" + "reference": "c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/665a1ac0a763c51afc30d6d130dac0813092b17f", - "reference": "665a1ac0a763c51afc30d6d130dac0813092b17f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631", + "reference": "c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631", "shasum": "" }, "require": { @@ -2136,7 +2136,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.11" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.12" }, "funding": [ { @@ -2144,7 +2144,7 @@ "type": "github" } ], - "time": "2022-02-18T12:46:09+00:00" + "time": "2022-02-23T06:30:26+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2389,16 +2389,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.14", + "version": "9.5.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "1883687169c017d6ae37c58883ca3994cfc34189" + "reference": "dc738383c519243b0a967f63943a848d3fd861aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1883687169c017d6ae37c58883ca3994cfc34189", - "reference": "1883687169c017d6ae37c58883ca3994cfc34189", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/dc738383c519243b0a967f63943a848d3fd861aa", + "reference": "dc738383c519243b0a967f63943a848d3fd861aa", "shasum": "" }, "require": { @@ -2414,7 +2414,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2.7", + "phpunit/php-code-coverage": "^9.2.12", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -2476,7 +2476,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.14" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.15" }, "funding": [ { @@ -2488,7 +2488,7 @@ "type": "github" } ], - "time": "2022-02-18T12:54:07+00:00" + "time": "2022-02-23T08:53:20+00:00" }, { "name": "sebastian/cli-parser", From 61265604fb8073de3c780eab21fbce6656371dc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:20:19 +0000 Subject: [PATCH 2/5] Bump phpunit/phpunit from 9.5.15 to 9.5.16 (#4863) Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.15 to 9.5.16. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/commits/9.5.16) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index 5db199d405..9fd4c5cac9 100644 --- a/composer.lock +++ b/composer.lock @@ -2071,16 +2071,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.12", + "version": "9.2.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631" + "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631", - "reference": "c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/deac8540cb7bd40b2b8cfa679b76202834fd04e8", + "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8", "shasum": "" }, "require": { @@ -2136,7 +2136,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.12" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.13" }, "funding": [ { @@ -2144,7 +2144,7 @@ "type": "github" } ], - "time": "2022-02-23T06:30:26+00:00" + "time": "2022-02-23T17:02:38+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2389,16 +2389,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.15", + "version": "9.5.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "dc738383c519243b0a967f63943a848d3fd861aa" + "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/dc738383c519243b0a967f63943a848d3fd861aa", - "reference": "dc738383c519243b0a967f63943a848d3fd861aa", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5ff8c545a50226c569310a35f4fa89d79f1ddfdc", + "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc", "shasum": "" }, "require": { @@ -2414,7 +2414,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2.12", + "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -2476,7 +2476,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.16" }, "funding": [ { @@ -2488,7 +2488,7 @@ "type": "github" } ], - "time": "2022-02-23T08:53:20+00:00" + "time": "2022-02-23T17:10:58+00:00" }, { "name": "sebastian/cli-parser", From 784c34f784e0c88fb31911dc64a619aed56fe52f Mon Sep 17 00:00:00 2001 From: Dylan T Date: Wed, 2 Mar 2022 02:29:04 +0000 Subject: [PATCH 3/5] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d376751cc..0f91b11423 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,8 @@ ## For developers * [Building and running from source](BUILDING.md) * [Developer documentation](https://devdoc.pmmp.io) - General documentation for PocketMine-MP plugin developers - * [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP-doc/doxygen/) - Doxygen documentation generated from development + * [Latest release API documentation](https://apidoc.pmmp.io) - Doxygen API documentation generated for each release + * [Latest bleeding-edge API documentation](https://apidoc-dev.pmmp.io) - Doxygen API documentation generated weekly from `next-major` branch * [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) From f181c602094da1fff1cd5e6f580016896850d591 Mon Sep 17 00:00:00 2001 From: EndermanbugZJFC <53002741+Endermanbugzjfc@users.noreply.github.com> Date: Thu, 3 Mar 2022 00:28:02 +0800 Subject: [PATCH 4/5] Fixed typo (occured => occurred) (#4873) [ci skip] --- src/utils/Internet.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/Internet.php b/src/utils/Internet.php index ff0c3ca219..42745b59a1 100644 --- a/src/utils/Internet.php +++ b/src/utils/Internet.php @@ -160,7 +160,7 @@ class Internet{ * * @param string[]|string $args * @param string[] $extraHeaders - * @param string|null $err reference parameter, will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation. + * @param string|null $err reference parameter, will be set to the output of curl_error(). Use this to retrieve errors that occurred during the operation. * @phpstan-param string|array $args * @phpstan-param list $extraHeaders */ From d47a7f48bdb1c9f921e00936397388fbec6d64b2 Mon Sep 17 00:00:00 2001 From: Rush2929 <76860328+Rush2929@users.noreply.github.com> Date: Thu, 3 Mar 2022 02:32:56 +0900 Subject: [PATCH 5/5] BrewingStand: avoid duplicate method call (#4874) --- src/block/tile/BrewingStand.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/block/tile/BrewingStand.php b/src/block/tile/BrewingStand.php index e008c7fdab..a75b4d9f1b 100644 --- a/src/block/tile/BrewingStand.php +++ b/src/block/tile/BrewingStand.php @@ -148,18 +148,20 @@ class BrewingStand extends Spawnable implements Container, Nameable{ * @phpstan-return array */ private function getBrewableRecipes() : array{ - if($this->inventory->getItem(BrewingStandInventory::SLOT_INGREDIENT)->isNull()){ + $ingredient = $this->inventory->getItem(BrewingStandInventory::SLOT_INGREDIENT); + if($ingredient->isNull()){ return []; } $recipes = []; + $craftingManager = $this->position->getWorld()->getServer()->getCraftingManager(); foreach([BrewingStandInventory::SLOT_BOTTLE_LEFT, BrewingStandInventory::SLOT_BOTTLE_MIDDLE, BrewingStandInventory::SLOT_BOTTLE_RIGHT] as $slot){ $input = $this->inventory->getItem($slot); if($input->isNull()){ continue; } - if(($recipe = $this->position->getWorld()->getServer()->getCraftingManager()->matchBrewingRecipe($input, $this->inventory->getItem(BrewingStandInventory::SLOT_INGREDIENT))) !== null){ + if(($recipe = $craftingManager->matchBrewingRecipe($input, $ingredient)) !== null){ $recipes[$slot] = $recipe; } }