Merge branch 'stable' into next-minor

This commit is contained in:
Dylan K. Taylor
2020-05-06 20:25:11 +01:00
7 changed files with 71 additions and 37 deletions

View File

@ -16,22 +16,22 @@ parameters:
path: ../../../src/pocketmine/command/CommandReader.php
-
message: "#^Default value of the parameter \\#4 \\$min \\(\\-30000000\\) of method pocketmine\\\\command\\\\defaults\\\\VanillaCommand\\:\\:getRelativeDouble\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#4 \\$min \\(int\\) of method pocketmine\\\\command\\\\defaults\\\\VanillaCommand\\:\\:getRelativeDouble\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/command/defaults/VanillaCommand.php
-
message: "#^Default value of the parameter \\#5 \\$max \\(30000000\\) of method pocketmine\\\\command\\\\defaults\\\\VanillaCommand\\:\\:getRelativeDouble\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#5 \\$max \\(int\\) of method pocketmine\\\\command\\\\defaults\\\\VanillaCommand\\:\\:getRelativeDouble\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/command/defaults/VanillaCommand.php
-
message: "#^Default value of the parameter \\#3 \\$min \\(\\-30000000\\) of method pocketmine\\\\command\\\\defaults\\\\VanillaCommand\\:\\:getDouble\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#3 \\$min \\(int\\) of method pocketmine\\\\command\\\\defaults\\\\VanillaCommand\\:\\:getDouble\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/command/defaults/VanillaCommand.php
-
message: "#^Default value of the parameter \\#4 \\$max \\(30000000\\) of method pocketmine\\\\command\\\\defaults\\\\VanillaCommand\\:\\:getDouble\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#4 \\$max \\(int\\) of method pocketmine\\\\command\\\\defaults\\\\VanillaCommand\\:\\:getDouble\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/command/defaults/VanillaCommand.php
@ -46,82 +46,82 @@ parameters:
path: ../../../src/pocketmine/level/format/io/region/RegionLoader.php
-
message: "#^Default value of the parameter \\#4 \\$expansion \\(1\\) of method pocketmine\\\\level\\\\generator\\\\noise\\\\Perlin\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#4 \\$expansion \\(int\\) of method pocketmine\\\\level\\\\generator\\\\noise\\\\Perlin\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/generator/noise/Perlin.php
-
message: "#^Default value of the parameter \\#4 \\$expansion \\(1\\) of method pocketmine\\\\level\\\\generator\\\\noise\\\\Simplex\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#4 \\$expansion \\(int\\) of method pocketmine\\\\level\\\\generator\\\\noise\\\\Simplex\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/generator/noise/Simplex.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\AnvilBreakSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\AnvilBreakSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/AnvilBreakSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\AnvilFallSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\AnvilFallSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/AnvilFallSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\AnvilUseSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\AnvilUseSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/AnvilUseSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\BlazeShootSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\BlazeShootSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/BlazeShootSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\ClickSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\ClickSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/ClickSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\DoorBumpSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\DoorBumpSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/DoorBumpSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\DoorCrashSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\DoorCrashSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/DoorCrashSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\DoorSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\DoorSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/DoorSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\FizzSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\FizzSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/FizzSound.php
-
message: "#^Default value of the parameter \\#3 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\GenericSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#3 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\GenericSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/GenericSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\GhastShootSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\GhastShootSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/GhastShootSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\GhastSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\GhastSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/GhastSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\LaunchSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\LaunchSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/LaunchSound.php
-
message: "#^Default value of the parameter \\#2 \\$pitch \\(0\\) of method pocketmine\\\\level\\\\sound\\\\PopSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
message: "#^Default value of the parameter \\#2 \\$pitch \\(int\\) of method pocketmine\\\\level\\\\sound\\\\PopSound\\:\\:__construct\\(\\) is incompatible with type float\\.$#"
count: 1
path: ../../../src/pocketmine/level/sound/PopSound.php
@ -131,9 +131,9 @@ parameters:
path: ../../../src/pocketmine/network/mcpe/protocol/DataPacket.php
-
message: "#^Strict comparison using \\!\\=\\= between string and false will always evaluate to true\\.$#"
message: "#^Strict comparison using \\=\\=\\= between string and false will always evaluate to false\\.$#"
count: 1
path: ../../../src/pocketmine/utils/Timezone.php
path: ../../../src/pocketmine/utils/Utils.php
-
message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNotNull\\(\\) with int and string will always evaluate to true\\.$#"

View File

@ -63,6 +63,32 @@ class UtilsTest extends TestCase{
self::assertEquals("HIGHEST", $tags["priority"]);
}
/**
* @return string[][]
* @phpstan-return list<array{string}>
*/
public function parseDocCommentOneLineProvider() : array{
return [
["/** @ignoreCancelled true dummy */"],
["/**@ignoreCancelled true dummy*/"],
["/** @ignoreCancelled true dummy */"]
];
}
/**
* @dataProvider parseDocCommentOneLineProvider
*/
public function testParseOneLineDocComment(string $comment) : void{
$tags = Utils::parseDocComment($comment);
self::assertArrayHasKey("ignoreCancelled", $tags);
self::assertEquals("true dummy", $tags["ignoreCancelled"]);
}
public function testParseEmptyDocComment() : void{
$tags = Utils::parseDocComment("");
self::assertCount(0, $tags);
}
public function testNamespacedNiceClosureName() : void{
//be careful with this test. The closure has to be declared on the same line as the assertion.
self::assertSame('closure@' . Utils::cleanPath(__FILE__) . '#L' . __LINE__, Utils::getNiceClosureName(function() : void{}));