From 41e351ae5d59b46375319053d49fcaefd13b8a01 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:15 +0200 Subject: [PATCH] Continue with getter/setter cleanup --- Controller/BackendController.php | 14 +++++++------- Theme/Backend/calendar-dashboard.tpl.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index ecad054..039e6df 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -50,19 +50,19 @@ final class BackendController extends Controller implements DashboardElementInte $view = new View($this->app->l11nManager, $request, $response); /** @var \phpOMS\Model\Html\Head $head */ - $head = $response->get('Content')->getData('head'); + $head = $response->get('Content')->head; $head->addAsset(AssetType::CSS, '/Modules/Calendar/Theme/Backend/css/styles.css?v=1.0.0'); $view->setTemplate('/Modules/Calendar/Theme/Backend/calendar-dashboard'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response); /** @var \Modules\Calendar\Models\Calendar $calendar */ $calendar = CalendarMapper::get()->where('id', 1)->execute(); $calendar->date = new SmartDateTime((string) ($request->getData('date') ?? 'now')); - $view->addData('calendar', $calendar); + $view->data['calendar'] = $calendar; $calendarEventPopup = new \Modules\Calendar\Theme\Backend\Components\Event\BaseView($this->app->l11nManager, $request, $response); - $view->addData('calendarEventPopup', $calendarEventPopup); + $view->data['calendarEventPopup'] = $calendarEventPopup; return $view; } @@ -74,7 +74,7 @@ final class BackendController extends Controller implements DashboardElementInte public function viewDashboard(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { /** @var \phpOMS\Model\Html\Head $head */ - $head = $response->get('Content')->getData('head'); + $head = $response->get('Content')->head; $head->addAsset(AssetType::CSS, '/Modules/Calendar/Theme/Backend/css/styles.css?v=1.0.0'); $view = new View($this->app->l11nManager, $request, $response); @@ -82,12 +82,12 @@ final class BackendController extends Controller implements DashboardElementInte $calendarView = new \Modules\Calendar\Theme\Backend\Components\Calendar\BaseView($this->app->l11nManager, $request, $response); $calendarView->setTemplate('/Modules/Calendar/Theme/Backend/Components/Calendar/mini'); - $view->addData('calendar', $calendarView); + $view->data['calendar'] = $calendarView; /** @var \Modules\Calendar\Models\Calendar $calendar */ $calendar = CalendarMapper::get()->where('id', 1)->execute(); $calendar->date = new SmartDateTime((string) ($request->getData('date') ?? 'now')); - $view->addData('cal', $calendar); + $view->data['cal'] = $calendar; return $view; } diff --git a/Theme/Backend/calendar-dashboard.tpl.php b/Theme/Backend/calendar-dashboard.tpl.php index fe42da9..6d3ea95 100755 --- a/Theme/Backend/calendar-dashboard.tpl.php +++ b/Theme/Backend/calendar-dashboard.tpl.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -$calendar = $this->getData('calendar'); +$calendar = $this->data['calendar']; ?>