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

---
 Controller/ApiController.php                  | 22 +++++++--------
 Models/Tag.php                                |  6 ++--
 Models/TagL11n.php                            | 28 +------------------
 .../Components/TagSelector/BaseView.php       | 14 +---------
 .../Components/TagSelector/base.tpl.php       |  2 +-
 Theme/Backend/tag-single.tpl.php              |  2 +-
 tests/Controller/ApiControllerTest.php        | 16 +++++------
 tests/Models/TagL11nMapperTest.php            |  4 +--
 tests/Models/TagL11nTest.php                  |  8 +++---
 9 files changed, 32 insertions(+), 70 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index f178503..f32b85e 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -81,7 +81,7 @@ final class ApiController extends Controller
         /** @var Tag $old */
         $old = clone TagMapper::get((int) $request->getData('id'));
         $new = $this->updateTagFromRequest($request);
-        $this->updateModel($request->getHeader()->getAccount(), $old, $new, TagMapper::class, 'tag', $request->getOrigin());
+        $this->updateModel($request->header->account, $old, $new, TagMapper::class, 'tag', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Tag', 'Tag successfully updated', $new);
     }
 
@@ -121,21 +121,21 @@ final class ApiController extends Controller
     {
         if (!empty($val = $this->validateTagCreate($request))) {
             $response->set('tag_create', new FormValidation($val));
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
 
         $tag = $this->createTagFromRequest($request);
-        $this->createModel($request->getHeader()->getAccount(), $tag, TagMapper::class, 'tag', $request->getOrigin());
+        $this->createModel($request->header->account, $tag, TagMapper::class, 'tag', $request->getOrigin());
 
-        $l11nRequest = new HttpRequest($request->getUri());
+        $l11nRequest = new HttpRequest($request->uri);
         $l11nRequest->setData('tag', $tag->getId());
         $l11nRequest->setData('title', $request->getData('title'));
         $l11nRequest->setData('language', $request->getData('language'));
 
         $l11nTag = $this->createTagL11nFromRequest($l11nRequest);
-        $this->createModel($request->getHeader()->getAccount(), $l11nTag, TagL11nMapper::class, 'tag_l11n', $request->getOrigin());
+        $this->createModel($request->header->account, $l11nTag, TagL11nMapper::class, 'tag_l11n', $request->getOrigin());
 
         $tag->setTitle($l11nTag);
 
@@ -180,13 +180,13 @@ final class ApiController extends Controller
     {
         if (!empty($val = $this->validateTagL11nCreate($request))) {
             $response->set('tag_l11n_create', new FormValidation($val));
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
 
         $l11nTag = $this->createTagL11nFromRequest($request);
-        $this->createModel($request->getHeader()->getAccount(), $l11nTag, TagL11nMapper::class, 'tag_l11n', $request->getOrigin());
+        $this->createModel($request->header->account, $l11nTag, TagL11nMapper::class, 'tag_l11n', $request->getOrigin());
 
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Localization', 'Tag localization successfully created', $l11nTag);
     }
@@ -224,7 +224,7 @@ final class ApiController extends Controller
         $tagL11n->setLanguage((string) (
             $request->getData('language') ?? $request->getLanguage()
         ));
-        $tagL11n->setTitle((string) ($request->getData('title') ?? ''));
+        $tagL11n->title = (string) ($request->getData('title') ?? '');
 
         return $tagL11n;
     }
@@ -266,7 +266,7 @@ final class ApiController extends Controller
     {
         /** @var Tag $tag */
         $tag = TagMapper::get((int) $request->getData('id'));
-        $this->deleteModel($request->getHeader()->getAccount(), $tag, TagMapper::class, 'tag', $request->getOrigin());
+        $this->deleteModel($request->header->account, $tag, TagMapper::class, 'tag', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Tag', 'Tag successfully deleted', $tag);
     }
 
@@ -285,9 +285,9 @@ final class ApiController extends Controller
      */
     public function apiTagFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
-        $response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
+        $response->header->set('Content-Type', MimeType::M_JSON, true);
         $response->set(
-            $request->getUri()->__toString(),
+            $request->uri->__toString(),
             \array_values(
                 TagMapper::find((string) ($request->getData('search') ?? ''), 3)
             )
diff --git a/Models/Tag.php b/Models/Tag.php
index c0acac4..b9c1b9b 100755
--- a/Models/Tag.php
+++ b/Models/Tag.php
@@ -166,7 +166,7 @@ class Tag implements \JsonSerializable, ArrayableInterface
      */
     public function getTitle() : string
     {
-        return $this->title instanceof TagL11n ? $this->title->getTitle() : $this->title;
+        return $this->title instanceof TagL11n ? $this->title->title : $this->title;
     }
 
     /**
@@ -184,10 +184,10 @@ class Tag implements \JsonSerializable, ArrayableInterface
         if ($title instanceof TagL11n) {
             $this->title = $title;
         } elseif ($this->title instanceof TagL11n && \is_string($title)) {
-            $this->title->setTitle($title);
+            $this->title->title = $title;
         } elseif (\is_string($title)) {
             $this->title = new TagL11n();
-            $this->title->setTitle($title);
+            $this->title->title = $title;
             $this->title->setLanguage($lang);
         }
     }
diff --git a/Models/TagL11n.php b/Models/TagL11n.php
index d5c55cc..9dc50bc 100755
--- a/Models/TagL11n.php
+++ b/Models/TagL11n.php
@@ -57,7 +57,7 @@ class TagL11n implements \JsonSerializable, ArrayableInterface
      * @var string
      * @since 1.0.0
      */
-    private string $title = '';
+    public string $title = '';
 
     /**
      * Constructor.
@@ -136,32 +136,6 @@ class TagL11n implements \JsonSerializable, ArrayableInterface
         $this->language = $language;
     }
 
-    /**
-     * Get tag title.
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getTitle() : string
-    {
-        return $this->title;
-    }
-
-    /**
-     * Set title
-     *
-     * @param string $title Title
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setTitle(string $title) : void
-    {
-        $this->title = $title;
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/Theme/Backend/Components/TagSelector/BaseView.php b/Theme/Backend/Components/TagSelector/BaseView.php
index 7c9a9b3..691d862 100755
--- a/Theme/Backend/Components/TagSelector/BaseView.php
+++ b/Theme/Backend/Components/TagSelector/BaseView.php
@@ -60,7 +60,7 @@ class BaseView extends View
      * @var string
      * @since 1.0.0
      */
-    private string $name = '';
+    public string $name = '';
 
     /**
      * {@inheritdoc}
@@ -83,18 +83,6 @@ class BaseView extends View
         return $this->id;
     }
 
-    /**
-     * Get name
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getName() : string
-    {
-        return $this->name;
-    }
-
     /**
      * Get form
      *
diff --git a/Theme/Backend/Components/TagSelector/base.tpl.php b/Theme/Backend/Components/TagSelector/base.tpl.php
index eaa6659..7c6a5f0 100755
--- a/Theme/Backend/Components/TagSelector/base.tpl.php
+++ b/Theme/Backend/Components/TagSelector/base.tpl.php
@@ -40,7 +40,7 @@
 </div>
 <div class="box" data-form="<?= $this->printHtml($this->getForm()); ?>" id="<?= $this->printHtml($this->getId()); ?>-tags" data-limit="0" data-active="true">
     <template id="<?= $this->printHtml($this->getId()); ?>-tagTemplate">
-        <span class="tag" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->getName()); ?>" style="background: {/color};">
+        <span class="tag" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>" style="background: {/color};">
             <i class="fa fa-times"></i>
             <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
             <span data-tpl-text="/title" data-tpl-value="/title" data-value=""></span>
diff --git a/Theme/Backend/tag-single.tpl.php b/Theme/Backend/tag-single.tpl.php
index 491729c..92157ab 100755
--- a/Theme/Backend/tag-single.tpl.php
+++ b/Theme/Backend/tag-single.tpl.php
@@ -58,7 +58,7 @@ echo $this->getData('nav')->render(); ?>
                         <td><a href="#"><i class="fa fa-times"></i></a>
                         <td><a href="#"><i class="fa fa-cogs"></i></a>
                         <td><?= ISO639Enum::getByName('_' . \strtoupper($value->getLanguage())); ?>
-                        <td><?= $value->getTitle(); ?>
+                        <td><?= $value->title; ?>
                     <?php endforeach; ?>
                     <?php if ($c === 0) : ?>
                     <tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 5f66331..d1f6877 100644
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -92,7 +92,7 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('color', '#ff0000ff');
         $request->setData('title', 'ApiTagEN');
         $request->setData('language', ISO639x1Enum::_EN);
@@ -116,7 +116,7 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $this->module->apiTagCreate($request, $response);
 
-        self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
+        self::assertEquals(RequestStatusCode::R_400, $response->header->status);
     }
 
     /**
@@ -128,14 +128,14 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('tag', self::$tagId);
         $request->setData('title', 'ApiTagDE');
         $request->setData('language', ISO639x1Enum::_DE);
 
         $this->module->apiTagL11nCreate($request, $response);
 
-        self::assertEquals('ApiTagDE', $response->get('')['response']->getTitle());
+        self::assertEquals('ApiTagDE', $response->get('')['response']->title);
         self::assertGreaterThan(0, $response->get('')['response']->getId());
     }
 
@@ -150,7 +150,7 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $this->module->apiTagL11nCreate($request, $response);
 
-        self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
+        self::assertEquals(RequestStatusCode::R_400, $response->header->status);
     }
 
     /**
@@ -162,7 +162,7 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('id', self::$tagId);
 
         $this->module->apiTagGet($request, $response);
@@ -179,7 +179,7 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('id', self::$tagId);
         $request->setData('color', '#00ff00ff');
 
@@ -198,7 +198,7 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('search', 'ApiTag');
 
         $this->module->apiTagFind($request, $response);
diff --git a/tests/Models/TagL11nMapperTest.php b/tests/Models/TagL11nMapperTest.php
index aafc716..523467e 100644
--- a/tests/Models/TagL11nMapperTest.php
+++ b/tests/Models/TagL11nMapperTest.php
@@ -41,7 +41,7 @@ class TagL11nMapperTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($id, $tag->getId());
 
         $l11n = new TagL11n();
-        $l11n->setTitle('TestTitle');
+        $l11n->title = 'TestTitle';
         $l11n->setLanguage(ISO639x1Enum::_EN);
         $l11n->setTag($id);
 
@@ -50,7 +50,7 @@ class TagL11nMapperTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($id, $l11n->getId());
 
         $l11nR = TagL11nMapper::get($l11n->getId());
-        self::assertEquals($l11n->getTitle(), $l11nR->getTitle());
+        self::assertEquals($l11n->title, $l11nR->title);
         self::assertEquals($l11n->getLanguage(), $l11nR->getLanguage());
     }
 }
diff --git a/tests/Models/TagL11nTest.php b/tests/Models/TagL11nTest.php
index b4aae78..a14fcee 100644
--- a/tests/Models/TagL11nTest.php
+++ b/tests/Models/TagL11nTest.php
@@ -37,7 +37,7 @@ class TagL11nTest extends \PHPUnit\Framework\TestCase
     {
         self::assertEquals(0, $this->l11n->getId());
         self::assertEquals(0, $this->l11n->getTag());
-        self::assertEquals('', $this->l11n->getTitle());
+        self::assertEquals('', $this->l11n->title);
         self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage());
     }
 
@@ -67,8 +67,8 @@ class TagL11nTest extends \PHPUnit\Framework\TestCase
      */
     public function testTitleInputOutput() : void
     {
-        $this->l11n->setTitle('Title');
-        self::assertEquals('Title', $this->l11n->getTitle());
+        $this->l11n->title = 'Title';
+        self::assertEquals('Title', $this->l11n->title);
     }
 
     /**
@@ -77,7 +77,7 @@ class TagL11nTest extends \PHPUnit\Framework\TestCase
      */
     public function testSerialize() : void
     {
-        $this->l11n->setTitle('Title');
+        $this->l11n->title = 'Title';
         $this->l11n->setTag(2);
         $this->l11n->setLanguage(ISO639x1Enum::_DE);