From f83e60a59205be54a5ff43c6250c17c9446d3692 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 24 Sep 2023 03:50:15 +0000 Subject: [PATCH] test fixes --- DataStorage/Database/DatabasePool.php | 8 +++++--- Message/Http/HttpHeader.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/DataStorage/Database/DatabasePool.php b/DataStorage/Database/DatabasePool.php index 08c84602b..0cbd6cd09 100755 --- a/DataStorage/Database/DatabasePool.php +++ b/DataStorage/Database/DatabasePool.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace phpOMS\DataStorage\Database; +use Mpdf\Tag\P; use phpOMS\DataStorage\Database\Connection\ConnectionAbstract; use phpOMS\DataStorage\Database\Connection\ConnectionFactory; use phpOMS\DataStorage\Database\Connection\NullConnection; @@ -74,11 +75,12 @@ final class DatabasePool implements DataStoragePoolInterface return new NullConnection(); } - if (empty($key)) { - return \reset($this->pool); + $con = empty($key) ? \reset($this->pool) : $this->pool[$key]; + if ($con->status !== DatabaseStatus::OK) { + $con->connect(); } - return $this->pool[$key]; + return $con; } /** diff --git a/Message/Http/HttpHeader.php b/Message/Http/HttpHeader.php index 7cea29823..3f7bfdbe2 100755 --- a/Message/Http/HttpHeader.php +++ b/Message/Http/HttpHeader.php @@ -186,7 +186,7 @@ final class HttpHeader extends HeaderAbstract */ public function getBrowserName() : string { - $userAgent = $_SERVER['HTTP_USER_AGENT']; + $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? ''; if (\strpos($userAgent, 'Opera') !== false || \strpos($userAgent, 'OPR/') !== false) { return 'Opera';