From 75dc3bc7d323f9f9bc85c8a4ecd17a613fa81de1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 23 Sep 2023 11:34:46 +0000 Subject: [PATCH] fix tests --- DataStorage/Database/Connection/ConnectionAbstract.php | 6 +----- DataStorage/Database/Connection/NullPDO.php | 8 -------- tests/Router/WebRouterTest.php | 3 ++- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/DataStorage/Database/Connection/ConnectionAbstract.php b/DataStorage/Database/Connection/ConnectionAbstract.php index f911c4188..10a53f8e3 100755 --- a/DataStorage/Database/Connection/ConnectionAbstract.php +++ b/DataStorage/Database/Connection/ConnectionAbstract.php @@ -193,7 +193,7 @@ abstract class ConnectionAbstract implements ConnectionInterface */ public function isInitialized() : bool { - return $this->con !== null && !($this->con instanceof NullPDO); + return !($this->con instanceof NullPDO); } /** @@ -207,10 +207,6 @@ abstract class ConnectionAbstract implements ConnectionInterface */ public function __get(string $name) : mixed { - if ($name === 'con' && $this->con === null) { - $this->connect($this->dbdata); - } - return isset($this->{$name}) ? $this->{$name} : null; } diff --git a/DataStorage/Database/Connection/NullPDO.php b/DataStorage/Database/Connection/NullPDO.php index 738fef46f..d8f8adcdd 100755 --- a/DataStorage/Database/Connection/NullPDO.php +++ b/DataStorage/Database/Connection/NullPDO.php @@ -32,12 +32,4 @@ final class NullPDO extends \PDO public function __construct() { } - - /** - * {@inheritdoc} - */ - public function jsonSerialize() : mixed - { - return ['id' => $this->id]; - } } diff --git a/tests/Router/WebRouterTest.php b/tests/Router/WebRouterTest.php index 612d8782a..ebe3ac000 100755 --- a/tests/Router/WebRouterTest.php +++ b/tests/Router/WebRouterTest.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace phpOMS\tests\Router; use phpOMS\Account\Account; +use phpOMS\Account\NullAccount; use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionType; use phpOMS\Autoloader; @@ -229,7 +230,7 @@ final class WebRouterTest extends \PHPUnit\Framework\TestCase PermissionType::READ ) extends PermissionAbstract {}; - $account = new Account(); + $account = new NullAccount(1); $account->addPermission($perm); self::assertEquals(