mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-03 16:45:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge 'minor-next' into 'major-next'

Browse Source 
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12643390650
This commit is contained in:
pmmp-admin-bot[bot]
2025-01-07 01:24:48 +00:00
parent 3f7f11b812 a17512de93
commit 708784b0a2
74 changed files with 156 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/phpstan/configs/actual-problems.neon
View File

@ -791,7 +791,7 @@ parameters:
path: ../../../src/utils/Config.php
-
message: "#^Parameter \\#1 \\$config of static method pocketmine\\\\utils\\\\Config\\:\\:writeProperties\\(\\) expects array\\<string, bool\\|float\\|int\\|string\\>, array\\<string, mixed\\> given\\.$#"
message: "#^Parameter \\#1 \\$config of static method pocketmine\\\\utils\\\\Config\\:\\:writeProperties\\(\\) expects array\\<int\\|string, bool\\|float\\|int\\|string\\>, array\\<int\\|string, mixed\\> given\\.$#"
count: 1
path: ../../../src/utils/Config.php

15
tests/phpstan/configs/phpstan-bugs.neon
View File

@ -1,20 +1,5 @@
parameters:
ignoreErrors:
-
message: "#^Method pocketmine\\\\block\\\\CakeWithCandle\\:\\:onInteractCandle\\(\\) has parameter \\$returnedItems with no value type specified in iterable type array\\.$#"
count: 1
path: ../../../src/block/CakeWithCandle.php
-
message: "#^Method pocketmine\\\\block\\\\CopperDoor\\:\\:onInteractCopper\\(\\) has parameter \\$returnedItems with no value type specified in iterable type array\\.$#"
count: 1
path: ../../../src/block/CopperDoor.php
-
message: "#^Method pocketmine\\\\block\\\\CopperTrapdoor\\:\\:onInteractCopper\\(\\) has parameter \\$returnedItems with no value type specified in iterable type array\\.$#"
count: 1
path: ../../../src/block/CopperTrapdoor.php
-
message: "#^Method pocketmine\\\\block\\\\DoubleTallGrass\\:\\:traitGetDropsForIncompatibleTool\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1

2
tests/phpstan/configs/spl-fixed-array-sucks.neon
View File

@ -16,7 +16,7 @@ parameters:
path: ../../../src/world/format/Chunk.php
-
message: "#^Method pocketmine\\\\world\\\\format\\\\HeightArray\\:\\:getValues\\(\\) should return array\\<int, int\\> but returns array\\<int, int\\|null\\>\\.$#"
message: "#^Method pocketmine\\\\world\\\\format\\\\HeightArray\\:\\:getValues\\(\\) should return non\\-empty\\-array\\<int, int\\> but returns array\\<int, int\\|null\\>\\.$#"
count: 1
path: ../../../src/world/format/HeightArray.php

6
tests/phpunit/block/BlockTypeIdsTest.php
View File

@ -35,8 +35,12 @@ class BlockTypeIdsTest extends TestCase{
$constants = $reflect->getConstants();
unset($constants['FIRST_UNUSED_BLOCK_ID']);
self::assertNotEmpty($constants, "We should never have zero type IDs");
self::assertSame($reflect->getConstant('FIRST_UNUSED_BLOCK_ID'), max($constants) + 1, "FIRST_UNUSED_BLOCK_ID must be one higher than the highest fixed type ID");
$max = max($constants);
self::assertIsInt($max, "Max type ID should always be an integer");
self::assertSame($reflect->getConstant('FIRST_UNUSED_BLOCK_ID'), $max + 1, "FIRST_UNUSED_BLOCK_ID must be one higher than the highest fixed type ID");
}
public function testNoDuplicates() : void{

6
tests/phpunit/item/ItemTypeIdsTest.php
View File

@ -35,8 +35,12 @@ class ItemTypeIdsTest extends TestCase{
$constants = $reflect->getConstants();
unset($constants['FIRST_UNUSED_ITEM_ID']);
self::assertNotEmpty($constants, "We should never have zero type IDs");
self::assertSame($reflect->getConstant('FIRST_UNUSED_ITEM_ID'), max($constants) + 1, "FIRST_UNUSED_ITEM_ID must be one higher than the highest fixed type ID");
$max = max($constants);
self::assertIsInt($max, "Max type ID should always be an integer");
self::assertSame($reflect->getConstant('FIRST_UNUSED_ITEM_ID'), $max + 1, "FIRST_UNUSED_ITEM_ID must be one higher than the highest fixed type ID");
}
public function testNoDuplicates() : void{