From 5a37d14f3f70edb046315390f8c4b3da8663a95a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:24 +0200 Subject: [PATCH] Continue with getter/setter cleanup --- Controller/BackendController.php | 70 ++++++++++++------------ Theme/Backend/category-list.tpl.php | 4 +- Theme/Backend/category-single.tpl.php | 4 +- Theme/Backend/cause-create.tpl.php | 2 +- Theme/Backend/cause-list.tpl.php | 4 +- Theme/Backend/cause-single.tpl.php | 4 +- Theme/Backend/cockpit.tpl.php | 2 +- Theme/Backend/department-list.tpl.php | 4 +- Theme/Backend/department-single.tpl.php | 4 +- Theme/Backend/process-list.tpl.php | 4 +- Theme/Backend/process-single.tpl.php | 4 +- Theme/Backend/project-list.tpl.php | 4 +- Theme/Backend/project-single.tpl.php | 4 +- Theme/Backend/risk-create.tpl.php | 2 +- Theme/Backend/risk-list.tpl.php | 4 +- Theme/Backend/risk-single.tpl.php | 4 +- Theme/Backend/settings-dashboard.tpl.php | 2 +- Theme/Backend/solution-create.tpl.php | 2 +- Theme/Backend/solution-list.tpl.php | 4 +- Theme/Backend/solution-single.tpl.php | 4 +- Theme/Backend/unit-list.tpl.php | 4 +- Theme/Backend/unit-single.tpl.php | 4 +- 22 files changed, 72 insertions(+), 72 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index ad54efa..439c456 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -54,7 +54,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cockpit'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); return $view; } @@ -75,10 +75,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $risks = RiskMapper::getAll()->execute(); - $view->addData('risks', $risks); + $view->data['risks'] = $risks; return $view; } @@ -99,10 +99,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $risk = RiskMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->addData('risk', $risk); + $view->data['risk'] = $risk; return $view; } @@ -123,7 +123,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); return $view; } @@ -144,10 +144,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cause-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $causes = CauseMapper::getAll()->execute(); - $view->addData('causes', $causes); + $view->data['causes'] = $causes; return $view; } @@ -168,10 +168,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cause-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $cause = CauseMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->addData('cause', $cause); + $view->data['cause'] = $cause; return $view; } @@ -192,10 +192,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/solution-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $solutions = SolutionMapper::getAll()->execute(); - $view->addData('solutions', $solutions); + $view->data['solutions'] = $solutions; return $view; } @@ -216,10 +216,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/solution-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $solution = SolutionMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->addData('solution', $solution); + $view->data['solution'] = $solution; return $view; } @@ -240,10 +240,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/unit-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $units = UnitMapper::getAll()->execute(); - $view->addData('units', $units); + $view->data['units'] = $units; return $view; } @@ -264,10 +264,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/unit-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $unit = UnitMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->addData('unit', $unit); + $view->data['unit'] = $unit; return $view; } @@ -288,10 +288,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/department-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $departments = DepartmentMapper::getAll()->execute(); - $view->addData('departments', $departments); + $view->data['departments'] = $departments; return $view; } @@ -312,10 +312,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/department-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $department = DepartmentMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->addData('department', $department); + $view->data['department'] = $department; return $view; } @@ -336,10 +336,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/category-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $categories = CategoryMapper::getAll()->execute(); - $view->addData('categories', $categories); + $view->data['categories'] = $categories; return $view; } @@ -360,10 +360,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/category-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $category = CategoryMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->addData('category', $category); + $view->data['category'] = $category; return $view; } @@ -384,10 +384,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/project-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $projects = ProjectMapper::getAll()->execute(); - $view->addData('projects', $projects); + $view->data['projects'] = $projects; return $view; } @@ -408,10 +408,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/project-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $project = ProjectMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->addData('project', $project); + $view->data['project'] = $project; return $view; } @@ -432,10 +432,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/process-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $processes = ProcessMapper::getAll()->execute(); - $view->addData('processes', $processes); + $view->data['processes'] = $processes; return $view; } @@ -456,10 +456,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/process-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $process = ProcessMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->addData('process', $process); + $view->data['process'] = $process; return $view; } @@ -480,7 +480,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/settings-dashboard'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); return $view; } diff --git a/Theme/Backend/category-list.tpl.php b/Theme/Backend/category-list.tpl.php index c87e2c4..4ce172d 100755 --- a/Theme/Backend/category-list.tpl.php +++ b/Theme/Backend/category-list.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$categories = $this->getData('categories'); -echo $this->getData('nav')->render(); ?> +$categories = $this->data['categories']; +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/category-single.tpl.php b/Theme/Backend/category-single.tpl.php index 0e5d169..6959da9 100755 --- a/Theme/Backend/category-single.tpl.php +++ b/Theme/Backend/category-single.tpl.php @@ -12,5 +12,5 @@ */ declare(strict_types=1); -$category = $this->getData('category'); -echo $this->getData('nav')->render(); +$category = $this->data['category']; +echo $this->data['nav']->render(); diff --git a/Theme/Backend/cause-create.tpl.php b/Theme/Backend/cause-create.tpl.php index 277d503..106bf8c 100755 --- a/Theme/Backend/cause-create.tpl.php +++ b/Theme/Backend/cause-create.tpl.php @@ -12,4 +12,4 @@ */ declare(strict_types=1); -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/cause-list.tpl.php b/Theme/Backend/cause-list.tpl.php index 85b5d32..c331a5b 100755 --- a/Theme/Backend/cause-list.tpl.php +++ b/Theme/Backend/cause-list.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$causes = $this->getData('causes'); -echo $this->getData('nav')->render(); ?> +$causes = $this->data['causes']; +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/cause-single.tpl.php b/Theme/Backend/cause-single.tpl.php index a45570c..9c61546 100755 --- a/Theme/Backend/cause-single.tpl.php +++ b/Theme/Backend/cause-single.tpl.php @@ -12,5 +12,5 @@ */ declare(strict_types=1); -$cause = $this->getData('cause'); -echo $this->getData('nav')->render(); +$cause = $this->data['cause']; +echo $this->data['nav']->render(); diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php index 08e5d47..3b024df 100755 --- a/Theme/Backend/cockpit.tpl.php +++ b/Theme/Backend/cockpit.tpl.php @@ -23,7 +23,7 @@ $footerView->setPages(25); $footerView->setPage(1); $footerView->setResults(1); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index d3718ef..4e1ad43 100755 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$departments = $this->getData('departments'); -echo $this->getData('nav')->render(); ?> +$departments = $this->data['departments']; +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/department-single.tpl.php b/Theme/Backend/department-single.tpl.php index fd10655..27a18f7 100755 --- a/Theme/Backend/department-single.tpl.php +++ b/Theme/Backend/department-single.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$department = $this->getData('department'); -echo $this->getData('nav')->render(); ?> +$department = $this->data['department']; +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/process-list.tpl.php b/Theme/Backend/process-list.tpl.php index bf1826d..3bb8701 100755 --- a/Theme/Backend/process-list.tpl.php +++ b/Theme/Backend/process-list.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$processes = $this->getData('processes'); -echo $this->getData('nav')->render(); ?> +$processes = $this->data['processes']; +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/process-single.tpl.php b/Theme/Backend/process-single.tpl.php index f5dc9e2..bd39a12 100755 --- a/Theme/Backend/process-single.tpl.php +++ b/Theme/Backend/process-single.tpl.php @@ -12,5 +12,5 @@ */ declare(strict_types=1); -$process = $this->getData('process'); -echo $this->getData('nav')->render(); +$process = $this->data['process']; +echo $this->data['nav']->render(); diff --git a/Theme/Backend/project-list.tpl.php b/Theme/Backend/project-list.tpl.php index c3f5f6e..a4b20ac 100755 --- a/Theme/Backend/project-list.tpl.php +++ b/Theme/Backend/project-list.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$projects = $this->getData('projects'); -echo $this->getData('nav')->render(); ?> +$projects = $this->data['projects']; +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/project-single.tpl.php b/Theme/Backend/project-single.tpl.php index ff69b75..e40b2d7 100755 --- a/Theme/Backend/project-single.tpl.php +++ b/Theme/Backend/project-single.tpl.php @@ -12,5 +12,5 @@ */ declare(strict_types=1); -$project = $this->getData('project'); -echo $this->getData('nav')->render(); +$project = $this->data['project']; +echo $this->data['nav']->render(); diff --git a/Theme/Backend/risk-create.tpl.php b/Theme/Backend/risk-create.tpl.php index 6e4ff7d..ee8e958 100755 --- a/Theme/Backend/risk-create.tpl.php +++ b/Theme/Backend/risk-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/risk-list.tpl.php b/Theme/Backend/risk-list.tpl.php index 0ab7b04..44923d5 100755 --- a/Theme/Backend/risk-list.tpl.php +++ b/Theme/Backend/risk-list.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$risks = $this->getData('risks'); -echo $this->getData('nav')->render(); ?> +$risks = $this->data['risks']; +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/risk-single.tpl.php b/Theme/Backend/risk-single.tpl.php index bd087ba..204116b 100755 --- a/Theme/Backend/risk-single.tpl.php +++ b/Theme/Backend/risk-single.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$risk = $this->getData('risk'); -echo $this->getData('nav')->render(); ?> +$risk = $this->data['risk']; +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/settings-dashboard.tpl.php b/Theme/Backend/settings-dashboard.tpl.php index 277d503..106bf8c 100755 --- a/Theme/Backend/settings-dashboard.tpl.php +++ b/Theme/Backend/settings-dashboard.tpl.php @@ -12,4 +12,4 @@ */ declare(strict_types=1); -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/solution-create.tpl.php b/Theme/Backend/solution-create.tpl.php index 277d503..106bf8c 100755 --- a/Theme/Backend/solution-create.tpl.php +++ b/Theme/Backend/solution-create.tpl.php @@ -12,4 +12,4 @@ */ declare(strict_types=1); -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/solution-list.tpl.php b/Theme/Backend/solution-list.tpl.php index bd959f5..c1a8d1c 100755 --- a/Theme/Backend/solution-list.tpl.php +++ b/Theme/Backend/solution-list.tpl.php @@ -12,9 +12,9 @@ */ declare(strict_types=1); -$solutions = $this->getData('solutions'); +$solutions = $this->data['solutions']; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/solution-single.tpl.php b/Theme/Backend/solution-single.tpl.php index bf6817b..f638a88 100755 --- a/Theme/Backend/solution-single.tpl.php +++ b/Theme/Backend/solution-single.tpl.php @@ -12,5 +12,5 @@ */ declare(strict_types=1); -$solution = $this->getData('solution'); -echo $this->getData('nav')->render(); +$solution = $this->data['solution']; +echo $this->data['nav']->render(); diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php index de330d9..552be3b 100755 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$units = $this->getData('units'); -echo $this->getData('nav')->render(); ?> +$units = $this->data['units']; +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/unit-single.tpl.php b/Theme/Backend/unit-single.tpl.php index 1113497..fc1bbc0 100755 --- a/Theme/Backend/unit-single.tpl.php +++ b/Theme/Backend/unit-single.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -$unit = $this->getData('unit'); -echo $this->getData('nav')->render(); ?> +$unit = $this->data['unit']; +echo $this->data['nav']->render(); ?>