From 6ce0efdbc5761b340de844bc8cdc876125c48e1b Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 24 Nov 2020 17:31:19 +0100
Subject: [PATCH] remove some getter/setter

---
 Controller/ApiController.php      | 6 +++---
 Controller/BackendController.php  | 2 +-
 Theme/Backend/draw-list.tpl.php   | 4 ++--
 Theme/Backend/draw-single.tpl.php | 2 +-
 tests/ControllerTest.php          | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index ed8857a..57e18be 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -76,7 +76,7 @@ final class ApiController extends Controller
     {
         if (!empty($val = $this->validateDrawCreate($request))) {
             $response->set('draw_create', new FormValidation($val));
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
@@ -115,10 +115,10 @@ final class ApiController extends Controller
             'status'    => UploadStatus::OK,
         ];
 
-        $media = MediaController::createDbEntry($status, $request->getHeader()->getAccount());
+        $media = MediaController::createDbEntry($status, $request->header->account);
         $draw  = $media !== null ? DrawImage::fromMedia($media) : null;
 
-        $this->createModel($request->getHeader()->getAccount(), $draw, DrawImageMapper::class, 'draw', $request->getOrigin());
+        $this->createModel($request->header->account, $draw, DrawImageMapper::class, 'draw', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Draw', 'Draw successfully created.', $draw);
     }
 
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index f476df3..b979bc2 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -92,7 +92,7 @@ final class BackendController extends Controller
 
         /** @var \Modules\Draw\Models\DrawImage $draw */
         $draw      = DrawImageMapper::get((int) ($request->getData('id')));
-        $accountId = $request->getHeader()->getAccount();
+        $accountId = $request->header->account;
 
         $view->setTemplate('/Modules/Draw/Theme/Backend/draw-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005201001, $request, $response));
diff --git a/Theme/Backend/draw-list.tpl.php b/Theme/Backend/draw-list.tpl.php
index 7da41d5..2b6c929 100755
--- a/Theme/Backend/draw-list.tpl.php
+++ b/Theme/Backend/draw-list.tpl.php
@@ -39,8 +39,8 @@ echo $this->getData('nav')->render(); ?>
                 $url         = \phpOMS\Uri\UriFactory::build('{/prefix}draw/single?{?}&id=' . $value->getId()); ?>
                     <tr>
                         <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getMedia()->getName()); ?></a>
-                        <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getMedia()->getCreatedBy()->getName()); ?></a>
-                        <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getMedia()->getCreatedAt()->format('Y-m-d')); ?></a>
+                        <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getMedia()->createdBy->login); ?></a>
+                        <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getMedia()->createdAt->format('Y-m-d')); ?></a>
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>
                 <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/draw-single.tpl.php b/Theme/Backend/draw-single.tpl.php
index eb7f7bd..5930479 100755
--- a/Theme/Backend/draw-single.tpl.php
+++ b/Theme/Backend/draw-single.tpl.php
@@ -77,7 +77,7 @@ echo $this->getData('nav')->render(); ?>
         <div class="m-draw">
             <section class="box wf-100" style="height: 30%;">
                 <div class="inner resizable">
-                    <canvas data-src="<?= $this->printHtml($this->request->getUri()->getBase() . $image->getMedia()->getPath()); ?>" id="canvasImage resizable" name="image" form="drawForm"></canvas>
+                    <canvas data-src="<?= $this->printHtml($this->request->uri->getBase() . $image->getMedia()->getPath()); ?>" id="canvasImage resizable" name="image" form="drawForm"></canvas>
                 </div>
             </section>
         </div>
diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
index ac060d6..887ff92 100755
--- a/tests/ControllerTest.php
+++ b/tests/ControllerTest.php
@@ -87,13 +87,13 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('title', 'Draw Title');
         $request->setData('image', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABIkAAACbCAYAAADm48vbAAAgAElEQVR4nOyddbiU5faGbzCwwD6KAbZii9hiYItYmNiBinpQsbDj2InFURGVUlEMEAvFbo6CGFigKGJggYXJ749n5rdnb2b2nvhy5rmva1/Kjpl3Zr7vjWet9SwwxiSdlsAbQK+4B2KMMcYYY4wxxhhj4qELMANoH/dAjDHGGGOMMcYYY0w8XA2MiHsQxhhjjDHGGGOMMSYeXF5mjDHGGGOMMcYYU+O4vMwYY4wxxhhjjDGmxnF5mTHGGGOMMcYYY0wN0wqXlxljjDHGGGOMMcbUNLsC03F5mTHGGGOMMcYYY0zNcg0wPO5BGGOMMcYYY4wxxph4aAW8CZwU90CMMcYYY4wxxhhjTDxky8vWi3sgxhhjjDHGGGOMMSYeXF5mjDHGGGOMMcYYU8O4vMwYY4wxxhhjjDGmxnF5mTHGGGOMMcYYY0yNcy0uLzPGGGOMMcYYY4ypWRYExgInxj0QY4wxxhhjjDHGGBMPuwE/AuvGPRBjjDHGGGOMMcYYEw/XAg/FPQhjjDHGGGOMMcYYEw8uLzPGGGOMMcYYY4ypcVxeZowxxhhjjDHGGFPjuLzMGGOMMcYYY4wxpoZphcvLjDHGGGOMMcYYUySt4x6ACYXOwDO4vMwYY4wxxhhjjDFFsgEwNO5BmEC5FBgZ9yCMMcYYY4wxxhiTPvYB/gH2insgpmJeAHrHPQhjjDHGGGOMMcakl2bAfTirKK1sDszK/NcYY4wxxhhjjDGmYrJZRbvEPRBTNL1RBpExxhhjjDHGGGNMoDQDrsNZRWlgJPIgMsYYY4wxxhhjjAkNexUll7WA6aiLmTHGGGOMMcYYY0zo2KsoefQAxgOt4h6IMcYYY4wxxhhjag9nFSWDIUDfuAdhjDHGGGMSx/LA+jlfK8Y7HGOMMdWOs4riow3wGdAt7oEYY4wxxphEsQHanz8M/C/n6wVg4xjHZYwxpk');
 
         $this->module->apiDrawCreate($request, $response);
 
-        self::assertEquals('Draw Title', $response->get('')['response']->getMedia()->getName());
+        self::assertEquals('Draw Title', $response->get('')['response']->getMedia()->name);
         self::assertGreaterThan(0, $response->get('')['response']->getId());
     }
 }