bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Changes:

Browse source 
- added type-hints
- added missing documentation
- renamed Logger::getWorker() to Logger::getLogger() as there is no worker class
  returned but the actual (inner) logger
This commit is contained in:
Roland Häder 2022-06-21 18:40:26 +02:00
commit cdcfb4064b
Signed by: roland
GPG key ID: C82EDE5DDFA0BA77
2 changed files with 43 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/Util/Database/StaticDatabase.php
View file

@ -129,6 +129,9 @@ class StaticDatabase extends Database
*/
public static function statConnect(array $server)
{
// Init variables
$db_host = $db_user = $db_data = $db_pw = '';
// Use environment variables for mysql if they are set beforehand
if (!empty($server['MYSQL_HOST'])
&& (!empty($server['MYSQL_USERNAME']) || !empty($server['MYSQL_USER']))
@ -158,14 +161,14 @@ class StaticDatabase extends Database
$serverdata = explode(':', $serveraddr);
$server = $serverdata[0];
if (count($serverdata) > 1) {
$port = trim($serverdata[1]);
$port = (int) trim($serverdata[1]);
}
$server = trim($server);
$user = trim($db_user);
$pass = trim($db_pw ?? '');
$pass = trim($db_pw);
$db = trim($db_data);
if (!(strlen($server) && strlen($user))) {
if (!(strlen($server) && strlen($user) && strlen($db))) {
return;
}