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

Utils: use type-safe checks to ensure file validity

Browse Source 
this gives the same results while keeping phpstan happy.
This commit is contained in:
Dylan K. Taylor 2020-04-15 10:19:51 +01:00
parent 917c744266
commit 372202b3dc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/utils/Utils.php
View File

@ -179,7 +179,7 @@ class Utils{
} }
$machine = php_uname("a"); $machine = php_uname("a");
$machine .= file_exists("/proc/cpuinfo") ? implode(preg_grep("/(model name|Processor|Serial)/", file("/proc/cpuinfo"))) : ""; $machine .= ($cpuinfo = @file("/proc/cpuinfo")) !== false ? implode(preg_grep("/(model name|Processor|Serial)/", $cpuinfo)) : "";
$machine .= sys_get_temp_dir(); $machine .= sys_get_temp_dir();
$machine .= $extra; $machine .= $extra;
$os = Utils::getOS(); $os = Utils::getOS();
@ -321,14 +321,14 @@ class Utils{
switch(Utils::getOS()){ switch(Utils::getOS()){
case "linux": case "linux":
case "android": case "android":
if(file_exists("/proc/cpuinfo")){ if(($cpuinfo = @file('/proc/cpuinfo')) !== false){
foreach(file("/proc/cpuinfo") as $l){ foreach($cpuinfo as $l){
if(preg_match('/^processor[ \t]*:[ \t]*[0-9]+$/m', $l) > 0){ if(preg_match('/^processor[ \t]*:[ \t]*[0-9]+$/m', $l) > 0){
++$processors; ++$processors;
} }
} }
}elseif(is_readable("/sys/devices/system/cpu/present")){ }elseif(($cpuPresent = @file_get_contents("/sys/devices/system/cpu/present")) !== false){
if(preg_match("/^([0-9]+)\\-([0-9]+)$/", trim(file_get_contents("/sys/devices/system/cpu/present")), $matches) > 0){ if(preg_match("/^([0-9]+)\\-([0-9]+)$/", trim($cpuPresent), $matches) > 0){
$processors = (int) ($matches[2] - $matches[1]); $processors = (int) ($matches[2] - $matches[1]);
} }
} }