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

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/world/Explosion.php
#	tests/phpunit/item/ItemTest.php
#	tests/phpunit/world/format/io/region/RegionLoaderTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMainLoggerTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMemoryLeakTest.php
This commit is contained in:
Dylan K. Taylor
2020-11-01 14:21:47 +00:00
parent c312c8ddd6 deb0cee8a0
commit 73a8c90bee
10 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/phpunit/block/BlockTest.php
View File

@ -116,8 +116,6 @@ class BlockTest extends TestCase{
/**
* @dataProvider blockGetProvider
* @param int $id
* @param int $meta
*/
public function testBlockGet(int $id, int $meta) : void{
$block = $this->blockFactory->get($id, $meta);

1
tests/phpunit/network/mcpe/handler/StupidJsonDecodeTest.php
View File

@ -57,7 +57,6 @@ class StupidJsonDecodeTest extends TestCase{
/**
* @dataProvider stupidJsonDecodeProvider
*
* @param string $brokenJson
* @param mixed $expect
*
* @throws \ReflectionException

2
tests/phpunit/utils/ConfigTest.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\utils;
use PHPUnit\Framework\TestCase;
use function yaml_parse;
class ConfigTest extends TestCase{
@ -61,7 +62,6 @@ class ConfigTest extends TestCase{
/**
* @dataProvider fixYamlIndexesProvider
*
* @param string $test
* @param mixed[] $expected
*/
public function testFixYamlIndexes(string $test, array $expected) : void{

1
tests/phpunit/utils/UtilsTest.php
View File

@ -51,7 +51,6 @@ class UtilsTest extends TestCase{
}
/**
* @param string $docComment
* @dataProvider parseDocCommentNewlineProvider
*/
public function testParseDocCommentNewlines(string $docComment) : void{

5
tests/phpunit/world/format/io/region/RegionLoaderTest.php
View File

@ -82,8 +82,6 @@ class RegionLoaderTest extends TestCase{
/**
* @dataProvider outOfBoundsCoordsProvider
* @param int $x
* @param int $z
*
* @throws ChunkException
* @throws \InvalidArgumentException
@ -110,9 +108,6 @@ class RegionLoaderTest extends TestCase{
/**
* @dataProvider outOfBoundsCoordsProvider
*
* @param int $x
* @param int $z
*
* @throws \InvalidArgumentException
* @throws \pocketmine\world\format\io\exception\CorruptedChunkException
*/

1
tests/phpunit/world/format/io/region/RegionLocationTableEntryTest.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\world\format\io\region;
use PHPUnit\Framework\TestCase;
use function sprintf;
class RegionLocationTableEntryTest extends TestCase{

1
tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/Main.php
View File

@ -26,6 +26,7 @@ namespace pmmp\TesterPlugin;
use pocketmine\event\Listener;
use pocketmine\event\server\CommandEvent;
use pocketmine\plugin\PluginBase;
use function array_shift;
class Main extends PluginBase implements Listener{

2
tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/Test.php
View File

@ -23,6 +23,8 @@ declare(strict_types=1);
namespace pmmp\TesterPlugin;
use function time;
abstract class Test{
const RESULT_WAITING = -1;
const RESULT_OK = 0;