Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-30 17:58:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-09-23 11:34:46 +00:00
parent 3264ca7ccb
commit 75dc3bc7d3
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataStorage/Database/Connection/ConnectionAbstract.php
View File

@ -193,7 +193,7 @@ abstract class ConnectionAbstract implements ConnectionInterface
*/ */
public function isInitialized() : bool 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 public function __get(string $name) : mixed
{ {
if ($name === 'con' && $this->con === null) {
$this->connect($this->dbdata);
}
return isset($this->{$name}) ? $this->{$name} : null; return isset($this->{$name}) ? $this->{$name} : null;
} }

8
DataStorage/Database/Connection/NullPDO.php
View File

@ -32,12 +32,4 @@ final class NullPDO extends \PDO
public function __construct() public function __construct()
{ {
} }
/**
* {@inheritdoc}
*/
public function jsonSerialize() : mixed
{
return ['id' => $this->id];
}
} }

3
tests/Router/WebRouterTest.php
View File

@ -15,6 +15,7 @@ declare(strict_types=1);
namespace phpOMS\tests\Router; namespace phpOMS\tests\Router;
use phpOMS\Account\Account; use phpOMS\Account\Account;
use phpOMS\Account\NullAccount;
use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionAbstract;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Autoloader; use phpOMS\Autoloader;
@ -229,7 +230,7 @@ final class WebRouterTest extends \PHPUnit\Framework\TestCase
PermissionType::READ PermissionType::READ
) extends PermissionAbstract {}; ) extends PermissionAbstract {};
$account = new Account(); $account = new NullAccount(1);
$account->addPermission($perm); $account->addPermission($perm);
self::assertEquals( self::assertEquals(