mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-05 17:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Fixed PHPUnit deprecation warnings

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-06-04 14:00:26 +01:00
parent 7fef8f0ab6
commit f9818efff4
11 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/phpunit/data/bedrock/block/upgrade/BlockStateUpgraderTest.php
View File

@ -69,7 +69,7 @@ class BlockStateUpgraderTest extends TestCase{
public function testRenameId() : void{
$this->getNewSchema()->renamedIds[self::TEST_BLOCK] = self::TEST_BLOCK_2;
$getStateData = fn() => $this->getEmptyPreimage();
$getStateData = fn() => self::getEmptyPreimage();
$upgradedStateData = $this->upgrade($getStateData(), $getStateData);
self::assertSame($upgradedStateData->getName(), self::TEST_BLOCK_2);
@ -79,11 +79,11 @@ class BlockStateUpgraderTest extends TestCase{
$schema->addedProperties[self::TEST_BLOCK][self::TEST_PROPERTY] = new IntTag(self::TEST_PROPERTY_VALUE_1);
}
private function getEmptyPreimage() : BlockStateData{
private static function getEmptyPreimage() : BlockStateData{
return new BlockStateData(self::TEST_BLOCK, [], self::TEST_VERSION);
}
private function getPreimageOneProperty(string $propertyName, int $value) : BlockStateData{
private static function getPreimageOneProperty(string $propertyName, int $value) : BlockStateData{
return new BlockStateData(
self::TEST_BLOCK,
[$propertyName => new IntTag($value)],
@ -94,7 +94,7 @@ class BlockStateUpgraderTest extends TestCase{
public function testAddNewProperty() : void{
$this->prepareAddPropertySchema($this->getNewSchema());
$getStateData = fn() => $this->getEmptyPreimage();
$getStateData = fn() => self::getEmptyPreimage();
$upgradedStateData = $this->upgrade($getStateData(), $getStateData);
self::assertSame(self::TEST_PROPERTY_VALUE_1, $upgradedStateData->getState(self::TEST_PROPERTY)?->getValue());
@ -103,7 +103,7 @@ class BlockStateUpgraderTest extends TestCase{
public function testAddPropertyAlreadyExists() : void{
$this->prepareAddPropertySchema($this->getNewSchema());
$getStateData = fn() => $this->getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1 + 1);
$getStateData = fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1 + 1);
$stateData = $getStateData();
$upgradedStateData = $this->upgrade($stateData, $getStateData);
@ -118,9 +118,9 @@ class BlockStateUpgraderTest extends TestCase{
/**
* @phpstan-return \Generator<int, array{\Closure() : BlockStateData}, void, void>
*/
public function removePropertyProvider() : \Generator{
yield [fn() => $this->getEmptyPreimage()];
yield [fn() => $this->getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1)];
public static function removePropertyProvider() : \Generator{
yield [fn() => self::getEmptyPreimage()];
yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1)];
}
/**
@ -142,10 +142,10 @@ class BlockStateUpgraderTest extends TestCase{
/**
* @phpstan-return \Generator<int, array{\Closure() : BlockStateData, ?int}, void, void>
*/
public function renamePropertyProvider() : \Generator{
yield [fn() => $this->getEmptyPreimage(), null];
yield [fn() => $this->getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1), self::TEST_PROPERTY_VALUE_1];
yield [fn() => $this->getPreimageOneProperty(self::TEST_PROPERTY_2, self::TEST_PROPERTY_VALUE_1), self::TEST_PROPERTY_VALUE_1];
public static function renamePropertyProvider() : \Generator{
yield [fn() => self::getEmptyPreimage(), null];
yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1), self::TEST_PROPERTY_VALUE_1];
yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY_2, self::TEST_PROPERTY_VALUE_1), self::TEST_PROPERTY_VALUE_1];
}
/**
@ -170,18 +170,18 @@ class BlockStateUpgraderTest extends TestCase{
/**
* @phpstan-return \Generator<int, array{\Closure() : BlockStateData, ?int}, void, void>
*/
public function remapPropertyValueProvider() : \Generator{
public static function remapPropertyValueProvider() : \Generator{
//no property to remap
yield [fn() => $this->getEmptyPreimage(), null];
yield [fn() => self::getEmptyPreimage(), null];
//value that will be remapped
yield [fn() => $this->getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1), self::TEST_PROPERTY_VALUE_2];
yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_1), self::TEST_PROPERTY_VALUE_2];
//value that is already at the target value
yield [fn() => $this->getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_2), self::TEST_PROPERTY_VALUE_2];
yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_2), self::TEST_PROPERTY_VALUE_2];
//value that is not remapped and is different from target value (to detect unconditional overwrite bugs)
yield [fn() => $this->getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_3), self::TEST_PROPERTY_VALUE_3];
yield [fn() => self::getPreimageOneProperty(self::TEST_PROPERTY, self::TEST_PROPERTY_VALUE_3), self::TEST_PROPERTY_VALUE_3];
}
/**
@ -213,7 +213,7 @@ class BlockStateUpgraderTest extends TestCase{
/**
* @phpstan-return \Generator<int, array{int, int, bool}, void, void>
*/
public function upgraderVersionCompatibilityProvider() : \Generator{
public static function upgraderVersionCompatibilityProvider() : \Generator{
yield [0x1_00_00_00, 0x1_00_00_00, true]; //Same version: must be altered - this may be a backwards-compatible change that Mojang didn't bother to bump for
yield [0x1_00_01_00, 0x1_00_00_00, true]; //Schema newer than block: must be altered
yield [0x1_00_00_00, 0x1_00_01_00, false]; //Block newer than schema: block must NOT be altered