diff --git a/build/php b/build/php index c6585061c..f51e95474 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit c6585061ca9b2f5aed7d030aae583fc3de9b2557 +Subproject commit f51e954743d32aba515a91b2d8b7e6a65e4ac064 diff --git a/composer.json b/composer.json index 68ee421c9..95a46dff7 100644 --- a/composer.json +++ b/composer.json @@ -34,9 +34,9 @@ "adhocore/json-comment": "^1.1", "fgrosse/phpasn1": "^2.3", "netresearch/jsonmapper": "^4.0", - "pocketmine/bedrock-block-upgrade-schema": "dev-master@dev", + "pocketmine/bedrock-block-upgrade-schema": "^1.0.0", "pocketmine/bedrock-data": "dev-modern-world-support@dev", - "pocketmine/bedrock-item-upgrade-schema": "dev-master", + "pocketmine/bedrock-item-upgrade-schema": "^1.0.0", "pocketmine/bedrock-protocol": "~18.1.0+bedrock-1.19.50", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", diff --git a/composer.lock b/composer.lock index 83a6d6ca0..413388479 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": "dbe37580d73d76d72e1b883fe73e1dad", + "content-hash": "8ab222cb51cdc02aff87dd02a71b6beb", "packages": [ { "name": "adhocore/json-comment", @@ -250,19 +250,18 @@ }, { "name": "pocketmine/bedrock-block-upgrade-schema", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git", - "reference": "b0cc441e029cf5a6de5b05dd0f5657208855232b" + "reference": "a05ce434eb7f8c11058d26833bc975fe635b23b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/b0cc441e029cf5a6de5b05dd0f5657208855232b", - "reference": "b0cc441e029cf5a6de5b05dd0f5657208855232b", + "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/a05ce434eb7f8c11058d26833bc975fe635b23b4", + "reference": "a05ce434eb7f8c11058d26833bc975fe635b23b4", "shasum": "" }, - "default-branch": true, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -271,9 +270,9 @@ "description": "Schemas describing how to upgrade saved block data in older Minecraft: Bedrock Edition world saves", "support": { "issues": "https://github.com/pmmp/BedrockBlockUpgradeSchema/issues", - "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/master" + "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/1.0.0" }, - "time": "2023-02-01T21:11:39+00:00" + "time": "2023-02-01T21:09:54+00:00" }, { "name": "pocketmine/bedrock-data", @@ -281,12 +280,12 @@ "source": { "type": "git", "url": "https://github.com/pmmp/BedrockData.git", - "reference": "d64617faab77300d828debcd1e3597b3403b63b7" + "reference": "6a735f1c6bf11fd100db1de9be029a4e1fd11558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/d64617faab77300d828debcd1e3597b3403b63b7", - "reference": "d64617faab77300d828debcd1e3597b3403b63b7", + "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/6a735f1c6bf11fd100db1de9be029a4e1fd11558", + "reference": "6a735f1c6bf11fd100db1de9be029a4e1fd11558", "shasum": "" }, "type": "library", @@ -299,23 +298,22 @@ "issues": "https://github.com/pmmp/BedrockData/issues", "source": "https://github.com/pmmp/BedrockData/tree/modern-world-support" }, - "time": "2022-12-02T13:01:28+00:00" + "time": "2023-01-31T23:58:53+00:00" }, { "name": "pocketmine/bedrock-item-upgrade-schema", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git", - "reference": "d984d2ee7283bc52e8733e7c7da1d0f6b6dc501f" + "reference": "7e53f77ea34ba30b1f94d3c24e64e19d3c4296e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/d984d2ee7283bc52e8733e7c7da1d0f6b6dc501f", - "reference": "d984d2ee7283bc52e8733e7c7da1d0f6b6dc501f", + "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/7e53f77ea34ba30b1f94d3c24e64e19d3c4296e7", + "reference": "7e53f77ea34ba30b1f94d3c24e64e19d3c4296e7", "shasum": "" }, - "default-branch": true, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -324,9 +322,9 @@ "description": "JSON schemas for upgrading items found in older Minecraft: Bedrock world saves", "support": { "issues": "https://github.com/pmmp/BedrockItemUpgradeSchema/issues", - "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/master" + "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.0.0" }, - "time": "2022-06-08T13:47:48+00:00" + "time": "2023-02-01T22:50:02+00:00" }, { "name": "pocketmine/bedrock-protocol", @@ -2254,16 +2252,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.28", + "version": "9.6.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e" + "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e", - "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7b1615e3e887d6c719121c6d4a44b0ab9645555", + "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555", "shasum": "" }, "require": { @@ -2305,7 +2303,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -2336,7 +2334,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.3" }, "funding": [ { @@ -2352,7 +2350,7 @@ "type": "tidelift" } ], - "time": "2023-01-14T12:32:24+00:00" + "time": "2023-02-04T13:37:15+00:00" }, { "name": "sebastian/cli-parser", @@ -2720,16 +2718,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -2771,7 +2769,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -2779,7 +2777,7 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", @@ -3093,16 +3091,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -3141,10 +3139,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -3152,7 +3150,7 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -3211,16 +3209,16 @@ }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -3255,7 +3253,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -3263,7 +3261,7 @@ "type": "github" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", @@ -3372,9 +3370,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "pocketmine/bedrock-block-upgrade-schema": 20, - "pocketmine/bedrock-data": 20, - "pocketmine/bedrock-item-upgrade-schema": 20 + "pocketmine/bedrock-data": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/src/world/generator/GeneratorManager.php b/src/world/generator/GeneratorManager.php index a00edd559..180450b72 100644 --- a/src/world/generator/GeneratorManager.php +++ b/src/world/generator/GeneratorManager.php @@ -40,7 +40,7 @@ final class GeneratorManager{ private array $list = []; public function __construct(){ - $this->addGenerator(Flat::class, "flat", \Closure::fromCallable(function(string $preset) : ?InvalidGeneratorOptionsException{ + $this->addGenerator(Flat::class, "flat", function(string $preset) : ?InvalidGeneratorOptionsException{ if($preset === ""){ return null; } @@ -50,7 +50,7 @@ final class GeneratorManager{ }catch(InvalidGeneratorOptionsException $e){ return $e; } - })); + }); $this->addGenerator(Normal::class, "normal", fn() => null); $this->addGenerator(Normal::class, "default", fn() => null); $this->addGenerator(Nether::class, "hell", fn() => null); diff --git a/tests/phpstan/configs/actual-problems.neon b/tests/phpstan/configs/actual-problems.neon index 0ab691189..9213ff96d 100644 --- a/tests/phpstan/configs/actual-problems.neon +++ b/tests/phpstan/configs/actual-problems.neon @@ -5,11 +5,6 @@ parameters: count: 2 path: ../../../build/make-release.php - - - message: "#^Parameter \\#1 \\$pharPath of function pocketmine\\\\build\\\\server_phar\\\\buildPhar expects string, array\\\\|string\\|false given\\.$#" - count: 1 - path: ../../../build/server-phar.php - - message: "#^Parameter \\#1 \\$strings of function pocketmine\\\\build\\\\server_phar\\\\preg_quote_array expects array\\, array\\ given\\.$#" count: 1 @@ -25,16 +20,6 @@ parameters: count: 1 path: ../../../src/Server.php - - - message: "#^Parameter \\#1 \\$input of function yaml_parse expects string, string\\|false given\\.$#" - count: 1 - path: ../../../src/Server.php - - - - message: "#^Cannot cast array\\\\|string\\|false to string\\.$#" - count: 1 - path: ../../../src/ServerConfigGroup.php - - message: "#^Cannot cast mixed to int\\.$#" count: 2