Merge pull request #8718 from MrPetovan/bug/fatal-errors

Use expected return variable type in Network\Probe::detect
This commit is contained in:
Michael Vogel 2020-06-03 06:13:48 +02:00 committed by GitHub
commit b1b4e98bd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -674,7 +674,7 @@ class Probe
$addr = $uri; $addr = $uri;
} else { } else {
Logger::log("Uri ".$uri." was not detectable", Logger::DEBUG); Logger::log("Uri ".$uri." was not detectable", Logger::DEBUG);
return false; return [];
} }
$webfinger = false; $webfinger = false;
@ -716,7 +716,7 @@ class Probe
return self::feed($uri); return self::feed($uri);
} }
$result = false; $result = [];
Logger::info("Probing", ['uri' => $uri]); Logger::info("Probing", ['uri' => $uri]);
@ -767,6 +767,7 @@ class Probe
$result["baseurl"] = substr($result["url"], 0, $pos).$host; $result["baseurl"] = substr($result["url"], 0, $pos).$host;
} }
} }
return $result; return $result;
} }