From 9ec72e14a20b1ecd9d8873b62ceb9cf516d23610 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:20 +0200 Subject: [PATCH] Continue with getter/setter cleanup --- Controller/BackendController.php | 67 +++++++++++----------- Theme/Backend/wiki-app-create.tpl.php | 4 +- Theme/Backend/wiki-app-list.tpl.php | 4 +- Theme/Backend/wiki-app-single.tpl.php | 4 +- Theme/Backend/wiki-category-list.tpl.php | 4 +- Theme/Backend/wiki-category-single.tpl.php | 2 +- Theme/Backend/wiki-dashboard.tpl.php | 8 +-- Theme/Backend/wiki-doc-create.tpl.php | 2 +- Theme/Backend/wiki-doc-single.tpl.php | 6 +- 9 files changed, 50 insertions(+), 51 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 925a811..ee59026 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -55,7 +55,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/Knowledgebase/Theme/Backend/styles.css?v=1.0.0'); } @@ -79,7 +79,7 @@ final class BackendController extends Controller $app = $request->getDataInt('app') ?? 1; $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-dashboard'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */ $categories = WikiCategoryMapper::getAll() @@ -89,7 +89,7 @@ final class BackendController extends Controller ->where('name/language', $response->header->l11n->language) ->execute(); - $view->setData('categories', $categories); + $view->data['categories'] = $categories; /** @var \Modules\Knowledgebase\Models\WikiDoc[] $documents */ $documents = WikiDocMapper::getAll() @@ -101,11 +101,11 @@ final class BackendController extends Controller ->limit(25)->sort('createdAt', OrderType::DESC) ->execute(); - $view->setData('docs', $documents); + $view->data['docs'] = $documents; /** @var \Modules\Knowledgebase\Models\WikiApp[] $apps */ $apps = WikiAppMapper::getAll()->execute(); - $view->setData('apps', $apps); + $view->data['apps'] = $apps; return $view; } @@ -127,11 +127,11 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-app-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); /** @var \Modules\Knowledgebase\Models\WikiApp[] $list */ $list = WikiAppMapper::getAll()->execute(); - $view->setData('apps', $list); + $view->data['apps'] = $list; return $view; } @@ -153,11 +153,11 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-app-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); /** @var \Modules\Knowledgebase\Models\WikiApp $app */ $app = WikiAppMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->setData('app', $app); + $view->data['app'] = $app; return $view; } @@ -178,9 +178,9 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-app-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); - $view->setData('app', new NullWikiApp()); + $view->data['app'] = new NullWikiApp(); return $view; } @@ -204,11 +204,11 @@ final class BackendController extends Controller $app = $request->getDataInt('app') ?? $this->app->unitId; $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); /** @var \Modules\Knowledgebase\Models\WikiCategory[] $list */ $list = WikiCategoryMapper::getAll()->with('name')->where('app', $app)->where('name/language', $response->header->l11n->language)->execute(); - $view->setData('categories', $list); + $view->data['categories'] = $list; return $view; } @@ -230,11 +230,11 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); /** @var \Modules\Knowledgebase\Models\WikiCategory $category */ $category = WikiCategoryMapper::get()->where('id', (int) $request->getData('id'))->execute(); - $view->setData('category', $category); + $view->data['category'] = $category; return $view; } @@ -255,9 +255,9 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); - $view->setData('category', new NullWikiCategory()); + $view->data['category'] = new NullWikiCategory(); return $view; } @@ -279,11 +279,11 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); /** @var \Modules\Knowledgebase\Models\WikiDoc[] $list */ $list = WikiDocMapper::getAll()->limit(25)->execute(); - $view->setData('docs', $list); + $view->data['docs'] = $list; return $view; } @@ -327,7 +327,7 @@ final class BackendController extends Controller } $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */ $categories = WikiCategoryMapper::getAll() @@ -337,11 +337,10 @@ final class BackendController extends Controller ->where('name/language', $response->header->l11n->language) ->execute(); - $view->setData('categories', $categories); - $view->setData('document', $document); - $view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( - PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::WIKI, $document->id) - ); + $view->data['categories'] = $categories; + $view->data['document'] = $document; + $view->['editable'] = $this->app->accountManager->get($accountId)->hasPermission( + PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::WIKI, $document->id); return $view; } @@ -363,15 +362,15 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); - $view->addData('editor', $editor); + $view->data['editor'] = $editor; $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response); - $view->addData('tagSelector', $tagSelector); + $view->data['tagSelector'] = $tagSelector; - $view->setData('doc', new NullWikiDoc()); + $view->data['doc'] = new NullWikiDoc(); return $view; } @@ -393,18 +392,18 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); - $view->addData('editor', $editor); + $view->data['editor'] = $editor; $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); - $view->addData('accGrpSelector', $accGrpSelector); + $view->data['accGrpSelector'] = $accGrpSelector; $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response); - $view->addData('tagSelector', $tagSelector); + $view->data['tagSelector'] = $tagSelector; - $view->addData('doc', WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute()); + $view->data['doc'] = WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); return $view; } diff --git a/Theme/Backend/wiki-app-create.tpl.php b/Theme/Backend/wiki-app-create.tpl.php index 11ac90c..3890fdd 100755 --- a/Theme/Backend/wiki-app-create.tpl.php +++ b/Theme/Backend/wiki-app-create.tpl.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -$app = $this->getData('app'); +$app = $this->data['app']; /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/wiki-app-list.tpl.php b/Theme/Backend/wiki-app-list.tpl.php index b7a216f..98326fb 100755 --- a/Theme/Backend/wiki-app-list.tpl.php +++ b/Theme/Backend/wiki-app-list.tpl.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -$apps = $this->getData('apps'); +$apps = $this->data['apps']; /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/wiki-app-single.tpl.php b/Theme/Backend/wiki-app-single.tpl.php index 11ac90c..3890fdd 100755 --- a/Theme/Backend/wiki-app-single.tpl.php +++ b/Theme/Backend/wiki-app-single.tpl.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -$app = $this->getData('app'); +$app = $this->data['app']; /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/wiki-category-list.tpl.php b/Theme/Backend/wiki-category-list.tpl.php index c39da14..6164e3f 100755 --- a/Theme/Backend/wiki-category-list.tpl.php +++ b/Theme/Backend/wiki-category-list.tpl.php @@ -15,10 +15,10 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */ -$categories = $this->getData('categories') ?? []; +$categories = $this->data['categories'] ?? []; /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/wiki-category-single.tpl.php b/Theme/Backend/wiki-category-single.tpl.php index 16e6297..839f769 100755 --- a/Theme/Backend/wiki-category-single.tpl.php +++ b/Theme/Backend/wiki-category-single.tpl.php @@ -4,7 +4,7 @@ */ declare(strict_types=1); -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php index 9d27708..67d7f93 100755 --- a/Theme/Backend/wiki-dashboard.tpl.php +++ b/Theme/Backend/wiki-dashboard.tpl.php @@ -17,15 +17,15 @@ use phpOMS\Utils\Parser\Markdown\Markdown; /** @var \phpOMS\Views\View $this */ /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */ -$categories = $this->getData('categories') ?? []; +$categories = $this->data['categories'] ?? []; /** @var \Modules\Knowledgebase\Models\WikiDoc[] $documents */ -$documents = $this->getData('docs') ?? []; +$documents = $this->data['docs'] ?? []; /** @var \Modules\Knowledgebase\Models\WikiApp[] $apps */ -$apps = $this->getData('apps') ?? []; +$apps = $this->data['apps'] ?? []; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/wiki-doc-create.tpl.php b/Theme/Backend/wiki-doc-create.tpl.php index 64d45b8..8220125 100755 --- a/Theme/Backend/wiki-doc-create.tpl.php +++ b/Theme/Backend/wiki-doc-create.tpl.php @@ -22,7 +22,7 @@ $isNewDoc = $wiki->id === 0; $languages = \phpOMS\Localization\ISO639Enum::getConstants(); /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/wiki-doc-single.tpl.php b/Theme/Backend/wiki-doc-single.tpl.php index 2da68aa..b3bae51 100755 --- a/Theme/Backend/wiki-doc-single.tpl.php +++ b/Theme/Backend/wiki-doc-single.tpl.php @@ -19,7 +19,7 @@ use Modules\Knowledgebase\Models\NullWikiDoc; * @var \Modules\Knowledgebase\Models\WikiCategory[] $categories * @var \Modules\Knowledgebase\Models\WikiDoc $doc */ -$categories = $this->getData('categories') ?? []; +$categories = $this->data['categories'] ?? []; /** @var \Modules\Knowledgebase\Models\WikiDoc $doc */ $doc = $this->getData('document') ?? new NullWikiDoc(); @@ -28,10 +28,10 @@ $doc = $this->getData('document') ?? new NullWikiDoc(); $tags = $doc->getTags(); /** @var bool $editable */ -$editable = $this->getData('editable'); +$editable = $this->data['editable']; /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); ?>