From 76f1add3b3bfb935db3959ccae6778a3cc499891 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 10 Jun 2020 10:34:34 +0100 Subject: [PATCH 1/2] Timezone: return false if date_parse() fails I hate this, but I don't want to change it to throw right now because it'll create a bunch of extra work. --- src/pocketmine/utils/Timezone.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pocketmine/utils/Timezone.php b/src/pocketmine/utils/Timezone.php index 4c7e29c1d..d6ef2dc3c 100644 --- a/src/pocketmine/utils/Timezone.php +++ b/src/pocketmine/utils/Timezone.php @@ -203,6 +203,9 @@ abstract class Timezone{ } $parsed = date_parse($offset); + if($parsed === false){ + return false; + } $offset = $parsed['hour'] * 3600 + $parsed['minute'] * 60 + $parsed['second']; //After date_parse is done, put the sign back From a7f10d8ccfb7442f3c53999669b43209be691fc4 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 10 Jun 2020 10:45:28 +0100 Subject: [PATCH 2/2] phpstan: ignore a FP (fixed in 0.12.26, but we can't upgrade yet) --- tests/phpstan/configs/phpstan-bugs.neon | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/phpstan/configs/phpstan-bugs.neon b/tests/phpstan/configs/phpstan-bugs.neon index 65c189e43..2c604d354 100644 --- a/tests/phpstan/configs/phpstan-bugs.neon +++ b/tests/phpstan/configs/phpstan-bugs.neon @@ -30,6 +30,11 @@ parameters: count: 1 path: ../../../src/pocketmine/network/mcpe/protocol/DataPacket.php + - + message: "#^Strict comparison using \\=\\=\\= between array and false will always evaluate to false\\.$#" + count: 1 + path: ../../../src/pocketmine/utils/Timezone.php + - message: "#^Strict comparison using \\=\\=\\= between string and false will always evaluate to false\\.$#" count: 1