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

---
 Controller/BackendController.php          | 12 ++++++------
 Controller/SearchController.php           |  6 +++---
 Controller/TimerecordingController.php    |  8 ++++----
 Theme/Backend/mid.tpl.php                 |  2 +-
 Theme/Backend/side.tpl.php                |  2 +-
 Views/NavigationView.php                  | 24 +----------------------
 tests/Controller/SearchControllerTest.php |  6 +++---
 tests/Views/NavigationViewTest.php        |  6 +++---
 8 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 181614c..35dd61a 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -49,7 +49,7 @@ final class BackendController extends Controller
     public function createNavigationMid(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView
     {
         $nav = Navigation::getInstance($request,
-            $this->app->accountManager->get($request->getHeader()->getAccount()),
+            $this->app->accountManager->get($request->header->account),
             $this->app->dbPool,
             $this->app->orgId,
             $this->app->appName
@@ -58,7 +58,7 @@ final class BackendController extends Controller
         $navView = new NavigationView($this->app->l11nManager, $request, $response);
         $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
         $navView->setNav($nav->getNav());
-        $navView->setParent($pageId);
+        $navView->parent = $pageId;
 
         return $navView;
     }
@@ -78,7 +78,7 @@ final class BackendController extends Controller
     {
         $navObj = Navigation::getInstance(
             $request,
-            $this->app->accountManager->get($request->getHeader()->getAccount()),
+            $this->app->accountManager->get($request->header->account),
             $this->app->dbPool,
             $this->app->orgId,
             $this->app->appName
@@ -89,7 +89,7 @@ final class BackendController extends Controller
 
         $unread = [];
         foreach ($this->receiving as $receiving) {
-            $unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->getHeader()->getAccount());
+            $unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->header->account);
         }
 
         $nav->setData('unread', $unread);
@@ -144,7 +144,7 @@ final class BackendController extends Controller
     public function createNavigationSplash(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView
     {
         $nav = Navigation::getInstance($request,
-            $this->app->accountManager->get($request->getHeader()->getAccount()),
+            $this->app->accountManager->get($request->header->account),
             $this->app->dbPool,
             $this->app->orgId,
             $this->app->appName
@@ -154,7 +154,7 @@ final class BackendController extends Controller
 
         $navView->setTemplate('/Modules/Navigation/Theme/Backend/splash');
         $navView->setNav($nav->getNav());
-        $navView->setParent($pageId);
+        $navView->parent = $pageId;
 
         return $navView;
     }
diff --git a/Controller/SearchController.php b/Controller/SearchController.php
index 9589e9f..59a3e47 100755
--- a/Controller/SearchController.php
+++ b/Controller/SearchController.php
@@ -79,16 +79,16 @@ final class SearchController extends Controller
             }
         }
 
-        $response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
+        $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
 
         if ($found === null) {
             $this->fillJsonResponse($request, $response, NotificationLevel::WARNING, 'Command', 'Unknown command "' . $search . '"', $search);
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
 
-        $response->set($request->getUri()->__toString(), new Redirect(UriFactory::build($found->uri)));
+        $response->set($request->uri->__toString(), new Redirect(UriFactory::build($found->uri)));
     }
 
     /**
diff --git a/Controller/TimerecordingController.php b/Controller/TimerecordingController.php
index c3e4ee2..b2cdcc1 100755
--- a/Controller/TimerecordingController.php
+++ b/Controller/TimerecordingController.php
@@ -44,7 +44,7 @@ final class TimerecordingController extends Controller
     public function createNavigationMid(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView
     {
         $nav = Navigation::getInstance($request,
-            $this->app->accountManager->get($request->getHeader()->getAccount()),
+            $this->app->accountManager->get($request->header->account),
             $this->app->dbPool,
             $this->app->orgId,
             $this->app->appName
@@ -73,7 +73,7 @@ final class TimerecordingController extends Controller
     {
         $navObj = Navigation::getInstance(
             $request,
-            $this->app->accountManager->get($request->getHeader()->getAccount()),
+            $this->app->accountManager->get($request->header->account),
             $this->app->dbPool,
             $this->app->orgId,
             $this->app->appName
@@ -84,7 +84,7 @@ final class TimerecordingController extends Controller
 
         $unread = [];
         foreach ($this->receiving as $receiving) {
-            $unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->getHeader()->getAccount());
+            $unread[$receiving] = $this->app->moduleManager->get($receiving)->openNav($request->header->account);
         }
 
         $nav->setData('unread', $unread);
@@ -139,7 +139,7 @@ final class TimerecordingController extends Controller
     public function createNavigationSplash(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView
     {
         $nav = Navigation::getInstance($request,
-            $this->app->accountManager->get($request->getHeader()->getAccount()),
+            $this->app->accountManager->get($request->header->account),
             $this->app->dbPool,
             $this->app->orgId,
             $this->app->appName
diff --git a/Theme/Backend/mid.tpl.php b/Theme/Backend/mid.tpl.php
index b2502fa..01ab41a 100755
--- a/Theme/Backend/mid.tpl.php
+++ b/Theme/Backend/mid.tpl.php
@@ -21,7 +21,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])
 ) {
     echo '<div class="row"><div class="col-xs-12"><ul class="nav-top" role="navigation">';
 
-    $uriPath = $this->request->getUri()->getPath();
+    $uriPath = $this->request->uri->getPath();
 
     foreach ($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT] as $key => $parent) {
         foreach ($parent as $link) {
diff --git a/Theme/Backend/side.tpl.php b/Theme/Backend/side.tpl.php
index b480692..26766d5 100755
--- a/Theme/Backend/side.tpl.php
+++ b/Theme/Backend/side.tpl.php
@@ -22,7 +22,7 @@ if (isset($this->nav[NavigationType::SIDE])) : ?>
 <div id="nav-side-outer">
     <ul id="nav-side-inner" class="nav" role="navigation">
         <?php
-        $uriPath = $this->request->getUri()->getPath();
+        $uriPath = $this->request->uri->getPath();
         foreach ($this->nav[NavigationType::SIDE][LinkType::CATEGORY] as $key => $parent) : ?>
         <li><input id="nav-<?= $this->printHtml($parent['nav_name']); ?>" type="checkbox">
             <ul>
diff --git a/Views/NavigationView.php b/Views/NavigationView.php
index 7bdc3fe..f3471a2 100755
--- a/Views/NavigationView.php
+++ b/Views/NavigationView.php
@@ -51,7 +51,7 @@ class NavigationView extends View
      * @var int
      * @since 1.0.0
      */
-    protected int $parent = 0;
+    public int $parent = 0;
 
     /**
      * Get navigation Id.
@@ -100,26 +100,4 @@ class NavigationView extends View
     {
         $this->nav = $nav;
     }
-
-    /**
-     * @return int
-     *
-     * @since 1.0.0
-     */
-    public function getParent() : int
-    {
-        return $this->parent;
-    }
-
-    /**
-     * @param int $parent Navigation parent element
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setParent(int $parent) : void
-    {
-        $this->parent = $parent;
-    }
 }
diff --git a/tests/Controller/SearchControllerTest.php b/tests/Controller/SearchControllerTest.php
index edc6b4a..ffa3ef3 100644
--- a/tests/Controller/SearchControllerTest.php
+++ b/tests/Controller/SearchControllerTest.php
@@ -98,7 +98,7 @@ class SearchControllerTest extends \PHPUnit\Framework\TestCase
         $request  = new HttpRequest(new HttpUri('https://127.0.0.1/en/backend'));
         $request->createRequestHashs(2);
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('search', ':goto General');
         $request->setData('app', 'Backend');
 
@@ -116,11 +116,11 @@ class SearchControllerTest extends \PHPUnit\Framework\TestCase
         $request  = new HttpRequest(new HttpUri('https://127.0.0.1/en/backend'));
         $request->createRequestHashs(0);
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('search', ':goto Invalid');
         $request->setData('app', 'Backend');
 
         $this->module->searchGoto($request, $response);
-        self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
+        self::assertEquals(RequestStatusCode::R_400, $response->header->status);
     }
 }
diff --git a/tests/Views/NavigationViewTest.php b/tests/Views/NavigationViewTest.php
index fd2c771..704da3f 100755
--- a/tests/Views/NavigationViewTest.php
+++ b/tests/Views/NavigationViewTest.php
@@ -31,7 +31,7 @@ class NavigationViewTest extends \PHPUnit\Framework\TestCase
 
         self::assertEquals(0, $view->getNavId());
         self::assertEquals([], $view->getNav());
-        self::assertEquals(0, $view->getParent());
+        self::assertEquals(0, $view->parent);
     }
 
     /**
@@ -48,7 +48,7 @@ class NavigationViewTest extends \PHPUnit\Framework\TestCase
         $view->setNav([1, 2, 3]);
         self::assertEquals([1, 2, 3], $view->getNav());
 
-        $view->setParent(4);
-        self::assertEquals(4, $view->getParent());
+        $view->parent = 4;
+        self::assertEquals(4, $view->parent);
     }
 }