From 2e7f464849048b2bba4236e4f6b5ff212d14dc56 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:25 +0200 Subject: [PATCH] Continue with getter/setter cleanup --- .../Install/Application/Shop/Application.php | 2 +- Admin/Install/Application/Shop/index.tpl.php | 2 +- Admin/Settings/Theme/Backend/settings.tpl.php | 6 +-- Controller/BackendController.php | 38 ++++++++----------- Theme/Backend/support-list.tpl.php | 4 +- Theme/Backend/support-ticket.tpl.php | 4 +- Theme/Backend/ticket-create.tpl.php | 2 +- 7 files changed, 26 insertions(+), 32 deletions(-) diff --git a/Admin/Install/Application/Shop/Application.php b/Admin/Install/Application/Shop/Application.php index 1df3092..65dc327 100755 --- a/Admin/Install/Application/Shop/Application.php +++ b/Admin/Install/Application/Shop/Application.php @@ -173,7 +173,7 @@ final class Application $head = new Head(); $pageView->setData('unitId', $this->app->unitId); - $pageView->setData('head', $head); + $pageView->data['head'] = $head; $response->set('Content', $pageView); /* App only allows GET */ diff --git a/Admin/Install/Application/Shop/index.tpl.php b/Admin/Install/Application/Shop/index.tpl.php index fd9d804..ffc3891 100755 --- a/Admin/Install/Application/Shop/index.tpl.php +++ b/Admin/Install/Application/Shop/index.tpl.php @@ -16,7 +16,7 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; /** @var phpOMS\Model\Html\Head $head */ -$head = $this->getData('head'); +$head = $this->head; /** @var array $dispatch */ $dispatch = $this->getData('dispatch') ?? []; diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php index 040d2ff..09aa1bb 100755 --- a/Admin/Settings/Theme/Backend/settings.tpl.php +++ b/Admin/Settings/Theme/Backend/settings.tpl.php @@ -14,10 +14,10 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; -$settings = $this->getData('settings') ?? []; -$applications = $this->getData('applications') ?? []; +$settings = $this->data['settings'] ?? []; +$applications = $this->data['applications'] ?? []; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 20dd558..85aae8e 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -68,12 +68,12 @@ final class BackendController extends Controller */ public function viewSupportList(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { - $head = $response->get('Content')->getData('head'); + $head = $response->get('Content')->head; $head->addAsset(AssetType::CSS, 'Modules/Tasks/Theme/Backend/css/styles.css?v=1.0.0'); $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/support-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response); $mapperQuery = TicketMapper::getAll() ->with('task') @@ -83,17 +83,11 @@ final class BackendController extends Controller ->limit(25); if ($request->getData('ptype') === 'p') { - $view->setData('tickets', - $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<')->execute() - ); + $view->data['tickets'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<')->execute(); } elseif ($request->getData('ptype') === 'n') { - $view->setData('tickets', - $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')->execute() - ); + $view->data['tickets'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')->execute(); } else { - $view->setData('tickets', - $mapperQuery->where('id', 0, '>')->execute() - ); + $view->data['tickets'] = $mapperQuery->where('id', 0, '>')->execute(); } return $view; @@ -116,7 +110,7 @@ final class BackendController extends Controller $view = new TicketView($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/support-ticket'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response); $mapperQuery = TicketMapper::get() ->with('task') @@ -137,13 +131,13 @@ final class BackendController extends Controller ? $mapperQuery->where('task', (int) $request->getData('for'))->execute() : $mapperQuery->where('id', (int) $request->getData('id'))->execute(); - $view->addData('ticket', $ticket); + $view->data['ticket'] = $ticket; $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); - $view->addData('accGrpSelector', $accGrpSelector); + $view->data['accGrpSelector'] = $accGrpSelector; $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); - $view->addData('editor', $editor); + $view->data['editor'] = $editor; return $view; } @@ -164,7 +158,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/ticket-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response); return $view; } @@ -185,7 +179,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/support-analysis'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response); return $view; } @@ -206,7 +200,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/support-settings'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response); return $view; } @@ -227,7 +221,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/user-support-dashboard'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response); return $view; } @@ -246,16 +240,16 @@ final class BackendController extends Controller public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $id = $request->getDataString('id') ?? ''; $settings = SettingMapper::getAll()->where('module', $id)->execute(); - $view->setData('settings', $settings); + $view->data['settings'] = $settings; /** @var \Modules\Support\Models\SupportApp[] $applications */ $applications = SupportAppMapper::getAll()->execute(); - $view->setData('applications', $applications); + $view->data['applications'] = $applications; $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings'); diff --git a/Theme/Backend/support-list.tpl.php b/Theme/Backend/support-list.tpl.php index 668f038..4568a66 100755 --- a/Theme/Backend/support-list.tpl.php +++ b/Theme/Backend/support-list.tpl.php @@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory; * @var \phpOMS\Views\View $this * @var \Modules\Support\Models\Ticket[] $tickets */ -$tickets = $this->getData('tickets'); +$tickets = $this->data['tickets']; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/support-ticket.tpl.php b/Theme/Backend/support-ticket.tpl.php index 9df96ec..f85be36 100755 --- a/Theme/Backend/support-ticket.tpl.php +++ b/Theme/Backend/support-ticket.tpl.php @@ -22,14 +22,14 @@ use phpOMS\Uri\UriFactory; * @var \Modules\Support\Vies\TicketView $this * @var \Modules\Support\Models\Ticket $ticket */ -$ticket = $this->getData('ticket'); +$ticket = $this->data['ticket']; $task = $ticket->task; $taskMedia = $task->getMedia(); $elements = $ticket->invertTicketElements(); $cElements = \count($elements); $color = 'red'; //$this->getStatus($task->getStatus()); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/ticket-create.tpl.php b/Theme/Backend/ticket-create.tpl.php index bc6c58d..91764a0 100755 --- a/Theme/Backend/ticket-create.tpl.php +++ b/Theme/Backend/ticket-create.tpl.php @@ -15,7 +15,7 @@ declare(strict_types=1); /** * @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>