From 5ca367e88862fedebd71e478023237de19386296 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 02:37:04 +0200 Subject: [PATCH 1/2] remove getId() --- Models/ProjectAttribute.php | 12 ------------ Models/ProjectAttributeType.php | 12 ------------ Models/ProjectAttributeValue.php | 11 ----------- 3 files changed, 35 deletions(-) diff --git a/Models/ProjectAttribute.php b/Models/ProjectAttribute.php index 85af70e..92b7fd2 100755 --- a/Models/ProjectAttribute.php +++ b/Models/ProjectAttribute.php @@ -67,18 +67,6 @@ class ProjectAttribute implements \JsonSerializable $this->value = new NullProjectAttributeValue(); } - /** - * Get id - * - * @return int - * - * @since 1.0.0 - */ - public function getId() : int - { - return $this->id; - } - /** * {@inheritdoc} */ diff --git a/Models/ProjectAttributeType.php b/Models/ProjectAttributeType.php index 5e7c897..03458e3 100755 --- a/Models/ProjectAttributeType.php +++ b/Models/ProjectAttributeType.php @@ -89,18 +89,6 @@ class ProjectAttributeType implements \JsonSerializable $this->setL11n($name); } - /** - * Get id - * - * @return int - * - * @since 1.0.0 - */ - public function getId() : int - { - return $this->id; - } - /** * Set l11n * diff --git a/Models/ProjectAttributeValue.php b/Models/ProjectAttributeValue.php index 29a17f1..e4738ab 100755 --- a/Models/ProjectAttributeValue.php +++ b/Models/ProjectAttributeValue.php @@ -108,17 +108,6 @@ class ProjectAttributeValue implements \JsonSerializable */ private ?BaseStringL11n $l11n = null; - /** - * Get id - * - * @return int - * - * @since 1.0.0 - */ - public function getId() : int - { - return $this->id; - } /** * Set value From 7dab5853c1268cbf1104d9ce0b345cfdc1b649a9 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:23 +0200 Subject: [PATCH 2/2] Continue with getter/setter cleanup --- Controller/BackendController.php | 18 +++++++++--------- Theme/Backend/projectmanagement-create.tpl.php | 2 +- Theme/Backend/projectmanagement-list.tpl.php | 4 ++-- .../Backend/projectmanagement-profile.tpl.php | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 01e4477..d3f014b 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -49,10 +49,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response); $projects = ProjectMapper::getAll()->sort('id', OrderType::DESC)->limit(25); - $view->addData('projects', $projects); + $view->data['projects'] = $projects; return $view; } @@ -73,7 +73,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response); return $view; } @@ -93,27 +93,27 @@ final class BackendController extends Controller public function viewProjectManagementProfile(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); $view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-profile'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response); $taskListView = new \Modules\Tasks\Theme\Backend\Components\Tasks\ListView($this->app->l11nManager, $request, $response); $taskListView->setTemplate('/Modules/Tasks/Theme/Backend/Components/Tasks/list'); - $view->addData('tasklist', $taskListView); + $view->data['tasklist'] = $taskListView; $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; $mediaListView = new \Modules\Media\Views\MediaView($this->app->l11nManager, $request, $response); $mediaListView->setTemplate('/Modules/Media/Theme/Backend/Components/Media/list'); - $view->addData('medialist', $mediaListView); + $view->data['medialist'] = $mediaListView; $project = ProjectMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->addData('project', $project); + $view->data['project'] = $project; return $view; } diff --git a/Theme/Backend/projectmanagement-create.tpl.php b/Theme/Backend/projectmanagement-create.tpl.php index 682b913..1826e1a 100755 --- a/Theme/Backend/projectmanagement-create.tpl.php +++ b/Theme/Backend/projectmanagement-create.tpl.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/projectmanagement-list.tpl.php b/Theme/Backend/projectmanagement-list.tpl.php index 80871f1..1008eaa 100755 --- a/Theme/Backend/projectmanagement-list.tpl.php +++ b/Theme/Backend/projectmanagement-list.tpl.php @@ -17,9 +17,9 @@ $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig'); $footerView->setPages(20); $footerView->setPage(1); -$list = $this->getData('projects'); +$list = $this->data['projects']; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/projectmanagement-profile.tpl.php b/Theme/Backend/projectmanagement-profile.tpl.php index d20f849..6f201d2 100755 --- a/Theme/Backend/projectmanagement-profile.tpl.php +++ b/Theme/Backend/projectmanagement-profile.tpl.php @@ -12,9 +12,9 @@ */ declare(strict_types=1); -$project = $this->getData('project'); +$project = $this->data['project']; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>