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

---
 Controller/ApiController.php | 14 ++++++++------
 Models/ReportMapper.php      |  2 +-
 Models/TemplateMapper.php    |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index e35866e..d09b704 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -15,15 +15,17 @@ declare(strict_types=1);
 namespace Modules\Helper\Controller;
 
 use Modules\Admin\Models\AccountPermission;
+use Modules\Admin\Models\NullAccount;
 use Modules\Helper\Models\NullReport;
+use Modules\Helper\Models\NullTemplate;
 use Modules\Helper\Models\PermissionState;
 use Modules\Helper\Models\Report;
 use Modules\Helper\Models\ReportMapper;
 use Modules\Helper\Models\Template;
 use Modules\Helper\Models\TemplateDataType;
 use Modules\Helper\Models\TemplateMapper;
-use Modules\Media\Models\NullCollection;
 
+use Modules\Media\Models\NullCollection;
 use phpOMS\Account\PermissionType;
 use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\Message\Http\HttpRequest;
@@ -301,12 +303,12 @@ final class ApiController extends Controller
         $helperTemplate->setDescriptionRaw((string) ($request->getData('description') ?? ''));
 
         if ($collectionId > 0) {
-            $helperTemplate->setSource($collectionId);
+            $helperTemplate->setSource(new NullCollection($collectionId));
         }
 
         $helperTemplate->setStandalone((bool) ($request->getData('standalone') ?? false));
         $helperTemplate->setExpected(!empty($expected) ? \json_decode($expected, true) : []);
-        $helperTemplate->setCreatedBy($request->getHeader()->getAccount());
+        $helperTemplate->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
         $helperTemplate->setDatatype((int) ($request->getData('datatype') ?? TemplateDataType::OTHER));
 
         return $helperTemplate;
@@ -383,9 +385,9 @@ final class ApiController extends Controller
     {
         $helperReport = new Report();
         $helperReport->setTitle((string) ($request->getData('name')));
-        $helperReport->setSource($collectionId);
-        $helperReport->setTemplate((int) $request->getData('template'));
-        $helperReport->setCreatedBy($request->getHeader()->getAccount());
+        $helperReport->setSource(new NullCollection($collectionId));
+        $helperReport->setTemplate(new NullTemplate((int) $request->getData('template')));
+        $helperReport->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
 
         return $helperReport;
     }
diff --git a/Models/ReportMapper.php b/Models/ReportMapper.php
index f92bda4..6b1360b 100644
--- a/Models/ReportMapper.php
+++ b/Models/ReportMapper.php
@@ -48,7 +48,7 @@ final class ReportMapper extends DataMapperAbstract
     /**
      * Has one relation.
      *
-     * @var array<string, array{mapper:string, self:string, by?:string}>
+     * @var array<string, array{mapper:string, self:string, by?:string, column?:string}>
      * @since 1.0.0
      */
     protected static array $ownsOne = [
diff --git a/Models/TemplateMapper.php b/Models/TemplateMapper.php
index f2be95a..1583c40 100644
--- a/Models/TemplateMapper.php
+++ b/Models/TemplateMapper.php
@@ -53,7 +53,7 @@ final class TemplateMapper extends DataMapperAbstract
     /**
      * Has one relation.
      *
-     * @var array<string, array{mapper:string, self:string, by?:string}>
+     * @var array<string, array{mapper:string, self:string, by?:string, column?:string}>
      * @since 1.0.0
      */
     protected static array $ownsOne = [
@@ -83,7 +83,7 @@ final class TemplateMapper 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 = [