From 2a8ece6fcc13bcbc73456f0c0d5339acdda6a6a8 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 7 Mar 2020 00:23:22 +0100
Subject: [PATCH] Type and cs fixes

---
 DataStorage/Database/DataMapperAbstract.php        | 14 ++++++++------
 Socket/Server/Server.php                           |  6 +++---
 tests/Account/AccountManagerTest.php               |  4 ++--
 .../Database/TestModel/BaseModelMapper.php         |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/DataStorage/Database/DataMapperAbstract.php b/DataStorage/Database/DataMapperAbstract.php
index 98b0268fd..cb0171f61 100644
--- a/DataStorage/Database/DataMapperAbstract.php
+++ b/DataStorage/Database/DataMapperAbstract.php
@@ -1904,13 +1904,15 @@ class DataMapperAbstract implements DataMapperInterface
     public static function populateManyToManyArray(array $result, array &$obj, int $depth = 3) : void
     {
         foreach ($result as $member => $values) {
-            if (!empty($values)) {
-                /** @var string $mapper */
-                $mapper = static::$hasMany[$member]['mapper'];
-
-                $objects      = $mapper::getArray($values, RelationType::ALL, $depth);
-                $obj[$member] = $objects;
+            if (empty($values)) {
+                continue;
             }
+
+            /** @var string $mapper */
+            $mapper = static::$hasMany[$member]['mapper'];
+
+            $objects      = $mapper::getArray($values, RelationType::ALL, $depth);
+            $obj[$member] = $objects;
         }
     }
 
diff --git a/Socket/Server/Server.php b/Socket/Server/Server.php
index 4f2df6e86..341197ac9 100644
--- a/Socket/Server/Server.php
+++ b/Socket/Server/Server.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace phpOMS\Socket\Server;
 
-use phpOMS\Account\Account;
+use Modules\Admin\Models\NullAccount;
 use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Message\Socket\PacketManager;
 use phpOMS\Socket\Client\ClientConnection;
@@ -270,8 +270,8 @@ class Server extends SocketAbstract
     public function connectClient($socket) : void
     {
         $this->app->logger->debug('Connecting client...');
-        $this->app->accountManager->add(new Account(1));
-        $this->clientManager->add($client = new ClientConnection(new Account(1), $socket));
+        $this->app->accountManager->add(new NullAccount(1));
+        $this->clientManager->add($client = new ClientConnection(new NullAccount(1), $socket));
         $this->conn[$client->getId()] = $socket;
         $this->app->logger->debug('Connected client.');
     }
diff --git a/tests/Account/AccountManagerTest.php b/tests/Account/AccountManagerTest.php
index 9245ee21e..852731cd7 100644
--- a/tests/Account/AccountManagerTest.php
+++ b/tests/Account/AccountManagerTest.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace phpOMS\tests\Account;
 
-use phpOMS\Account\Account;
 use phpOMS\Account\AccountManager;
+use phpOMS\Account\NullAccount;
 
 require_once __DIR__ . '/../Autoloader.php';
 
@@ -33,7 +33,7 @@ class AccountManagerTest extends \PHPUnit\Framework\TestCase
     {
         $this->manager = new AccountManager($GLOBALS['httpSession']);
 
-        $this->account = new Account(3);
+        $this->account = new NullAccount(3);
         $this->account->generatePassword('abcd');
     }
 
diff --git a/tests/DataStorage/Database/TestModel/BaseModelMapper.php b/tests/DataStorage/Database/TestModel/BaseModelMapper.php
index 87b1e7599..3411a11c5 100644
--- a/tests/DataStorage/Database/TestModel/BaseModelMapper.php
+++ b/tests/DataStorage/Database/TestModel/BaseModelMapper.php
@@ -61,7 +61,7 @@ class BaseModelMapper extends DataMapperAbstract
     /**
      * Has many relation.
      *
-     * @var array<string, array{mapper:string, table:string, self?:?string, external?:?string}>
+     * @var array<string, array{mapper:string, table:string, self?:?string, external?:?string, column?:string}>
      * @since 1.0.0
      */
     protected static array $hasMany = [