diff --git a/src/block/Rail.php b/src/block/Rail.php index 219faf632..c906470ca 100644 --- a/src/block/Rail.php +++ b/src/block/Rail.php @@ -61,18 +61,15 @@ class Rail extends BaseRail{ } protected function getPossibleConnectionDirectionsOneConstraint(int $constraint) : array{ - /** @var int[] $horizontal */ - static $horizontal = [ - Facing::NORTH, - Facing::SOUTH, - Facing::WEST, - Facing::EAST - ]; - $possible = parent::getPossibleConnectionDirectionsOneConstraint($constraint); if(($constraint & self::FLAG_ASCEND) === 0){ - foreach($horizontal as $d){ + foreach([ + Facing::NORTH, + Facing::SOUTH, + Facing::WEST, + Facing::EAST + ] as $d){ if($constraint !== $d){ $possible[$d] = true; } diff --git a/src/block/Torch.php b/src/block/Torch.php index 001fbba6f..570c11aa6 100644 --- a/src/block/Torch.php +++ b/src/block/Torch.php @@ -72,14 +72,13 @@ class Torch extends Flowable{ $this->facing = $face; return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player); }else{ - static $faces = [ + foreach([ Facing::SOUTH, Facing::WEST, Facing::NORTH, Facing::EAST, Facing::DOWN - ]; - foreach($faces as $side){ + ] as $side){ $block = $this->getSide($side); if(!$block->isTransparent()){ $this->facing = Facing::opposite($side); diff --git a/src/utils/EnumTrait.php b/src/utils/EnumTrait.php index 8eb2a1075..713698006 100644 --- a/src/utils/EnumTrait.php +++ b/src/utils/EnumTrait.php @@ -82,8 +82,7 @@ trait EnumTrait{ * @throws \InvalidArgumentException */ private function __construct(string $enumName){ - static $pattern = '/^\D[A-Za-z\d_]+$/u'; - if(preg_match($pattern, $enumName, $matches) === 0){ + if(preg_match('/^\D[A-Za-z\d_]+$/u', $enumName, $matches) === 0){ throw new \InvalidArgumentException("Invalid enum member name \"$enumName\", should only contain letters, numbers and underscores, and must not start with a number"); } $this->enumName = $enumName;