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

Merge commit 'a7f10d8cc'

Browse Source 
# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-06-13 11:52:17 +01:00
commit dba059d8da
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/Timezone.php
View File

@ -193,6 +193,9 @@ abstract class Timezone{
} }
$parsed = date_parse($offset); $parsed = date_parse($offset);
if($parsed === false){
return false;
}
$offset = $parsed['hour'] * 3600 + $parsed['minute'] * 60 + $parsed['second']; $offset = $parsed['hour'] * 3600 + $parsed['minute'] * 60 + $parsed['second'];
//After date_parse is done, put the sign back //After date_parse is done, put the sign back

5
tests/phpstan/configs/phpstan-bugs.neon
View File

@ -55,6 +55,11 @@ parameters:
count: 1 count: 1
path: ../../../src/network/mcpe/compression/ZlibCompressor.php path: ../../../src/network/mcpe/compression/ZlibCompressor.php
-
message: "#^Strict comparison using \\=\\=\\= between array and false will always evaluate to false\\.$#"
count: 1
path: ../../../src/utils/Timezone.php
- -
message: "#^Strict comparison using \\=\\=\\= between string and false will always evaluate to false\\.$#" message: "#^Strict comparison using \\=\\=\\= between string and false will always evaluate to false\\.$#"
count: 1 count: 1