From 007f4f9350cc1ce5b26fc70b6bce6950bfe72890 Mon Sep 17 00:00:00 2001 From: Dylan T Date: Mon, 8 Feb 2021 11:53:50 +0000 Subject: [PATCH 1/5] CraftingDataPacket: Remove useless @var comment --- src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php index 2401e862d..351582d47 100644 --- a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php @@ -84,7 +84,6 @@ class CraftingDataPacket extends DataPacket{ case self::ENTRY_SHAPELESS_CHEMISTRY: $entry["recipe_id"] = $this->getString(); $ingredientCount = $this->getUnsignedVarInt(); - /** @var Item */ $entry["input"] = []; for($j = 0; $j < $ingredientCount; ++$j){ $entry["input"][] = $in = $this->getRecipeIngredient(); From 928041ddf152ecd31af6996d8ee5db3ce57c2377 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 21:42:08 +0000 Subject: [PATCH 2/5] Bump phpstan/phpstan from 0.12.71 to 0.12.74 (#4028) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.71 to 0.12.74. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/0.12.71...0.12.74) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index b2a7a71e4..f33e93530 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "pocketmine/spl": "^0.4.0" }, "require-dev": { - "phpstan/phpstan": "0.12.71", + "phpstan/phpstan": "0.12.74", "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 de1d43b7e..8dc4bb662 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": "b0c6368d36038c48544f355ccecb3890", + "content-hash": "2c3d44ba85e878b5862488bdba8878c8", "packages": [ { "name": "adhocore/json-comment", @@ -1002,16 +1002,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.71", + "version": "0.12.74", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5" + "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5", - "reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bc5f9483c8f461c86653dcbd040cf0d2778c91a2", + "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2", "shasum": "" }, "require": { @@ -1042,7 +1042,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.71" + "source": "https://github.com/phpstan/phpstan/tree/0.12.74" }, "funding": [ { @@ -1058,7 +1058,7 @@ "type": "tidelift" } ], - "time": "2021-02-01T18:24:00+00:00" + "time": "2021-02-08T15:00:25+00:00" }, { "name": "phpstan/phpstan-phpunit", From d2204da1d5b11f0a08695d632004ab1cc22138b1 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 11 Feb 2021 16:05:55 +0000 Subject: [PATCH 3/5] [ci skip] center the build badges --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1c02cb9ed..bff7e31be 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,12 @@ A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP

-![CI](https://github.com/pmmp/PocketMine-MP/workflows/CI/badge.svg) -[![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/pmmp/PocketMine-MP?label=release&logo=github)](https://github.com/pmmp/PocketMine-MP/releases) -[![Docker Image Version (latest semver)](https://img.shields.io/docker/v/pmmp/pocketmine-mp?logo=docker&label=image)](https://hub.docker.com/r/pmmp/pocketmine-mp) -[![Discord](https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord)](https://discord.gg/bmSAZBG) +

+ CI + GitHub tag (latest semver) + Docker image version (latest semver) + Discord +

## Getting started - [Documentation](http://pmmp.readthedocs.org/) From 0e396dc47d052908c92cad0e5da41f6ef5f0281e Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 11 Feb 2021 16:24:09 +0000 Subject: [PATCH 4/5] actions: update PHP extension versions --- tests/gh-actions/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gh-actions/build.sh b/tests/gh-actions/build.sh index 905da6970..743821c7f 100755 --- a/tests/gh-actions/build.sh +++ b/tests/gh-actions/build.sh @@ -21,6 +21,6 @@ git clone https://github.com/php-build/php-build.git cd php-build ./install-dependencies.sh echo '"pthreads",,"https://github.com/pmmp/pthreads.git",,,"extension",' >> share/php-build/extension/definition -PHP_BUILD_INSTALL_EXTENSION='pthreads=@2bcd8b8c10395d58b8a9bc013e3a5328080c867f yaml=2.2.0' PHP_BUILD_ZTS_ENABLE=on ./bin/php-build "$VERSION" "$INSTALL_DIR" +PHP_BUILD_INSTALL_EXTENSION='pthreads=@acc6e52b2144c61c434b62a3cb680d537e06828e yaml=2.2.1' PHP_BUILD_ZTS_ENABLE=on ./bin/php-build "$VERSION" "$INSTALL_DIR" rm "$INSTALL_DIR/etc/conf.d/xdebug.ini" || true cp install-dependencies.sh "$INSTALL_DIR" From 7407e504b611ad3eb9a02fdbf8afd5af81b45143 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 11 Feb 2021 16:35:19 +0000 Subject: [PATCH 5/5] actions: bump PHP versions to 7.3.27 and 7.4.15 --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c5f202c2..848999328 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: image: [ubuntu-20.04] - php: [7.3.25, 7.4.13] + php: [7.3.27, 7.4.15] steps: - uses: actions/checkout@v2 #needed for build.sh @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.25, 7.4.13] + php: [7.3.27, 7.4.15] steps: - uses: actions/checkout@v2 @@ -87,7 +87,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.25, 7.4.13] + php: [7.3.27, 7.4.15] steps: - uses: actions/checkout@v2 @@ -137,7 +137,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.25, 7.4.13] + php: [7.3.27, 7.4.15] steps: - uses: actions/checkout@v2