mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 20:14:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '04191ec44a00dd058f5d7e9e315d451e44285494'

Browse Source 
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l7-baseline.neon
This commit is contained in:
Dylan K. Taylor
2020-06-17 20:40:12 +01:00
parent 14d3e5ce27 04191ec44a
commit 921aa091e0
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/block/Rail.php
View File

@@ -61,6 +61,7 @@ class Rail extends BaseRail{
} }
protected function getPossibleConnectionDirectionsOneConstraint(int $constraint) : array{ protected function getPossibleConnectionDirectionsOneConstraint(int $constraint) : array{
/** @var int[] $horizontal */
static $horizontal = [ static $horizontal = [
Facing::NORTH, Facing::NORTH,
Facing::SOUTH, Facing::SOUTH,

5
tests/phpstan/configs/l7-baseline.neon
View File

@@ -355,11 +355,6 @@ parameters:
count: 3 count: 3
path: ../../../src/block/Mycelium.php path: ../../../src/block/Mycelium.php
-
message: "#^Method pocketmine\\\\block\\\\Rail\\:\\:getPossibleConnectionDirectionsOneConstraint\\(\\) should return array\\<int, true\\> but returns array\\<int\\|string, true\\>\\.$#"
count: 1
path: ../../../src/block/Rail.php
- -
message: "#^Parameter \\#2 \\$x of static method pocketmine\\\\world\\\\generator\\\\object\\\\Tree\\:\\:growTree\\(\\) expects int, float\\|int given\\.$#" message: "#^Parameter \\#2 \\$x of static method pocketmine\\\\world\\\\generator\\\\object\\\\Tree\\:\\:growTree\\(\\) expects int, float\\|int given\\.$#"
count: 2 count: 2