From caa4b78a3fcc6e964f9c98520b4add8ff435bec5 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 21 Jun 2022 20:21:02 +0100 Subject: [PATCH] Update composer dependencies --- composer.json | 2 +- composer.lock | 27 +++++++++++----------- tests/phpstan/configs/actual-problems.neon | 17 +------------- tests/phpstan/configs/phpstan-bugs.neon | 10 -------- 4 files changed, 15 insertions(+), 41 deletions(-) diff --git a/composer.json b/composer.json index 479b8229f..69834fe8e 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "webmozart/path-util": "^2.3" }, "require-dev": { - "phpstan/phpstan": "1.7.8", + "phpstan/phpstan": "1.7.15", "phpstan/phpstan-phpunit": "^1.1.0", "phpstan/phpstan-strict-rules": "^1.2.0", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index b415198f2..9ea10f2b1 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": "363ffec55c206510b591b54f10138fc0", + "content-hash": "54ae200719453a6bb90afa4c67a50e71", "packages": [ { "name": "adhocore/json-comment", @@ -1737,16 +1737,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.7.8", + "version": "1.7.15", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a" + "reference": "cd0202ea1b1fc6d1bbe156c6e2e18a03e0ff160a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a", - "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd0202ea1b1fc6d1bbe156c6e2e18a03e0ff160a", + "reference": "cd0202ea1b1fc6d1bbe156c6e2e18a03e0ff160a", "shasum": "" }, "require": { @@ -1772,7 +1772,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.7.8" + "source": "https://github.com/phpstan/phpstan/tree/1.7.15" }, "funding": [ { @@ -1792,7 +1792,7 @@ "type": "tidelift" } ], - "time": "2022-06-01T13:43:17+00:00" + "time": "2022-06-20T08:29:01+00:00" }, { "name": "phpstan/phpstan-phpunit", @@ -2214,16 +2214,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.20", + "version": "9.5.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba" + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", "shasum": "" }, "require": { @@ -2257,7 +2257,6 @@ "sebastian/version": "^3.0.2" }, "require-dev": { - "ext-pdo": "*", "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { @@ -2301,7 +2300,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" }, "funding": [ { @@ -2313,7 +2312,7 @@ "type": "github" } ], - "time": "2022-04-01T12:37:26+00:00" + "time": "2022-06-19T12:14:25+00:00" }, { "name": "sebastian/cli-parser", diff --git a/tests/phpstan/configs/actual-problems.neon b/tests/phpstan/configs/actual-problems.neon index cbc07353f..3ddd1d228 100644 --- a/tests/phpstan/configs/actual-problems.neon +++ b/tests/phpstan/configs/actual-problems.neon @@ -131,7 +131,7 @@ parameters: path: ../../../src/block/DragonEgg.php - - message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int\\<0, max\\> given\\.$#" + message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int\\<0, 255\\> given\\.$#" count: 1 path: ../../../src/block/DragonEgg.php @@ -335,21 +335,6 @@ parameters: count: 3 path: ../../../src/block/Mycelium.php - - - message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#" - count: 1 - path: ../../../src/block/RedMushroom.php - - - - message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#" - count: 1 - path: ../../../src/block/RedMushroom.php - - - - message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#" - count: 1 - path: ../../../src/block/RedMushroom.php - - message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getBlockLightAt\\(\\) expects int, float\\|int given\\.$#" count: 1 diff --git a/tests/phpstan/configs/phpstan-bugs.neon b/tests/phpstan/configs/phpstan-bugs.neon index 61cb00d93..a1c53d2a4 100644 --- a/tests/phpstan/configs/phpstan-bugs.neon +++ b/tests/phpstan/configs/phpstan-bugs.neon @@ -5,11 +5,6 @@ parameters: count: 1 path: ../../../src/block/BaseBanner.php - - - message: "#^Property pocketmine\\\\block\\\\tile\\\\TileFactory\\:\\:\\$saveNames \\(array\\, string\\>\\) does not accept array\\, bool\\|string\\>\\.$#" - count: 1 - path: ../../../src/block/tile/TileFactory.php - - message: "#^Comparison operation \"\\<\" between int\\<1, max\\> and 1 is always false\\.$#" count: 1 @@ -80,11 +75,6 @@ parameters: count: 1 path: ../../../src/thread/Worker.php - - - message: "#^Dead catch \\- JsonException is never thrown in the try block\\.$#" - count: 1 - path: ../../../src/utils/Config.php - - message: "#^Call to function is_resource\\(\\) with resource will always evaluate to true\\.$#" count: 2