From 7ebb810e3b894b16905abae4cb911353d80494d5 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 30 May 2023 15:44:25 +0200
Subject: [PATCH] Continue with getter/setter cleanup

---
 Controller/BackendController.php     | 22 +++++++++++-----------
 Theme/Backend/surveys-create.tpl.php |  4 ++--
 Theme/Backend/surveys-list.tpl.php   |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index d007fd2..2abc766 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -47,7 +47,7 @@ final class BackendController extends Controller
      */
     public function setUpBackend(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
-        $head = $response->get('Content')->getData('head');
+        $head = $response->get('Content')->head;
         $head->addAsset(AssetType::CSS, '/Modules/Surveys/Theme/Backend/styles.css?v=1.0.0');
     }
 
@@ -67,7 +67,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Surveys/Theme/Backend/surveys-list');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response);
 
         $path    = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
         $surveys = SurveyTemplateMapper::getByVirtualPath($path)
@@ -77,11 +77,11 @@ final class BackendController extends Controller
 
         list($collection, $parent) = CollectionMapper::getCollectionsByPath($path);
 
-        $view->addData('parent', $parent);
-        $view->addData('collections', $collection);
-        $view->addData('path', $path);
-        $view->addData('surveys', $surveys);
-        $view->addData('account', $this->app->accountManager->get($request->header->account));
+        $view->data['parent'] = $parent;
+        $view->data['collections'] = $collection;
+        $view->data['path'] = $path;
+        $view->data['surveys'] = $surveys;
+        $view->data['account'] = $this->app->accountManager->get($request->header->account);
 
         return $view;
     }
@@ -102,7 +102,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Surveys/Theme/Backend/surveys-create');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response);
 
         return $view;
     }
@@ -123,7 +123,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Surveys/Theme/Backend/surveys-create');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response);
 
         /** @var \Modules\Surveys\Models\SurveyTemplate $survey */
         $survey = SurveyTemplateMapper::get()
@@ -142,7 +142,7 @@ final class BackendController extends Controller
             ->where('elements/labels/language', $response->header->l11n->language)
             ->execute();
 
-        $view->addData('survey', $survey);
+        $view->data['survey'] = $survey;
 
         return $view;
     }
@@ -163,7 +163,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Surveys/Theme/Backend/surveys-survey');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response);
 
         return $view;
     }
diff --git a/Theme/Backend/surveys-create.tpl.php b/Theme/Backend/surveys-create.tpl.php
index b857278..89380f2 100755
--- a/Theme/Backend/surveys-create.tpl.php
+++ b/Theme/Backend/surveys-create.tpl.php
@@ -15,9 +15,9 @@ declare(strict_types=1);
 use Modules\Surveys\Models\SurveyElementType;
 
 /** @var null|Modules\Surveys\Models\SurveyTemplate $survey */
-$survey = $this->getData('survey');
+$survey = $this->data['survey'];
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="tabview tab-2">
     <div class="box wf-100 col-xs-12">
diff --git a/Theme/Backend/surveys-list.tpl.php b/Theme/Backend/surveys-list.tpl.php
index d17098c..c3b6ab2 100755
--- a/Theme/Backend/surveys-list.tpl.php
+++ b/Theme/Backend/surveys-list.tpl.php
@@ -18,21 +18,21 @@ use phpOMS\Uri\UriFactory;
  * @var \phpOMS\Views\View               $this
  * @var \Modules\Surveys\Models\Survey[] $surveys
  */
-$surveys = $this->getData('surveys') ?? [];
+$surveys = $this->data['surveys'] ?? [];
 
 /** @var \Modules\Admin\Models\Account $account */
-$account = $this->getData('account');
+$account = $this->data['account'];
 
 $accountDir = $account->id . ' ' . $account->login;
 
 /** @var \Modules\Media\Models\Collection[] */
-$collections = $this->getData('collections');
+$collections = $this->data['collections'];
 $mediaPath   = \urldecode($this->getData('path') ?? '/');
 
 $previous = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \reset($surveys)->id . '&ptype=p';
 $next     = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \end($surveys)->id . '&ptype=n';
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">