Continue with getter/setter cleanup

This commit is contained in:
Dennis Eichhorn 2023-05-30 15:44:20 +02:00
parent 4255b2f2aa
commit 9ec72e14a2
9 changed files with 50 additions and 51 deletions

View File

@ -55,7 +55,7 @@ final class BackendController extends Controller
*/ */
public function setUpBackend(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void 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'); $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; $app = $request->getDataInt('app') ?? 1;
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-dashboard'); $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 */ /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */
$categories = WikiCategoryMapper::getAll() $categories = WikiCategoryMapper::getAll()
@ -89,7 +89,7 @@ final class BackendController extends Controller
->where('name/language', $response->header->l11n->language) ->where('name/language', $response->header->l11n->language)
->execute(); ->execute();
$view->setData('categories', $categories); $view->data['categories'] = $categories;
/** @var \Modules\Knowledgebase\Models\WikiDoc[] $documents */ /** @var \Modules\Knowledgebase\Models\WikiDoc[] $documents */
$documents = WikiDocMapper::getAll() $documents = WikiDocMapper::getAll()
@ -101,11 +101,11 @@ final class BackendController extends Controller
->limit(25)->sort('createdAt', OrderType::DESC) ->limit(25)->sort('createdAt', OrderType::DESC)
->execute(); ->execute();
$view->setData('docs', $documents); $view->data['docs'] = $documents;
/** @var \Modules\Knowledgebase\Models\WikiApp[] $apps */ /** @var \Modules\Knowledgebase\Models\WikiApp[] $apps */
$apps = WikiAppMapper::getAll()->execute(); $apps = WikiAppMapper::getAll()->execute();
$view->setData('apps', $apps); $view->data['apps'] = $apps;
return $view; return $view;
} }
@ -127,11 +127,11 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-app-list'); $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 */ /** @var \Modules\Knowledgebase\Models\WikiApp[] $list */
$list = WikiAppMapper::getAll()->execute(); $list = WikiAppMapper::getAll()->execute();
$view->setData('apps', $list); $view->data['apps'] = $list;
return $view; return $view;
} }
@ -153,11 +153,11 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-app-single'); $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 */ /** @var \Modules\Knowledgebase\Models\WikiApp $app */
$app = WikiAppMapper::get()->where('id', (int) $request->getData('id'))->execute(); $app = WikiAppMapper::get()->where('id', (int) $request->getData('id'))->execute();
$view->setData('app', $app); $view->data['app'] = $app;
return $view; return $view;
} }
@ -178,9 +178,9 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-app-single'); $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; return $view;
} }
@ -204,11 +204,11 @@ final class BackendController extends Controller
$app = $request->getDataInt('app') ?? $this->app->unitId; $app = $request->getDataInt('app') ?? $this->app->unitId;
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-list'); $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 */ /** @var \Modules\Knowledgebase\Models\WikiCategory[] $list */
$list = WikiCategoryMapper::getAll()->with('name')->where('app', $app)->where('name/language', $response->header->l11n->language)->execute(); $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; return $view;
} }
@ -230,11 +230,11 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-single'); $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 */ /** @var \Modules\Knowledgebase\Models\WikiCategory $category */
$category = WikiCategoryMapper::get()->where('id', (int) $request->getData('id'))->execute(); $category = WikiCategoryMapper::get()->where('id', (int) $request->getData('id'))->execute();
$view->setData('category', $category); $view->data['category'] = $category;
return $view; return $view;
} }
@ -255,9 +255,9 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-single'); $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; return $view;
} }
@ -279,11 +279,11 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-list'); $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 */ /** @var \Modules\Knowledgebase\Models\WikiDoc[] $list */
$list = WikiDocMapper::getAll()->limit(25)->execute(); $list = WikiDocMapper::getAll()->limit(25)->execute();
$view->setData('docs', $list); $view->data['docs'] = $list;
return $view; return $view;
} }
@ -327,7 +327,7 @@ final class BackendController extends Controller
} }
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-single'); $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 */ /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */
$categories = WikiCategoryMapper::getAll() $categories = WikiCategoryMapper::getAll()
@ -337,11 +337,10 @@ final class BackendController extends Controller
->where('name/language', $response->header->l11n->language) ->where('name/language', $response->header->l11n->language)
->execute(); ->execute();
$view->setData('categories', $categories); $view->data['categories'] = $categories;
$view->setData('document', $document); $view->data['document'] = $document;
$view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( $view->['editable'] = $this->app->accountManager->get($accountId)->hasPermission(
PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::WIKI, $document->id) PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::WIKI, $document->id);
);
return $view; return $view;
} }
@ -363,15 +362,15 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-create'); $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); $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); $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; return $view;
} }
@ -393,18 +392,18 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-create'); $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); $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); $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); $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; return $view;
} }

View File

@ -12,7 +12,7 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
$app = $this->getData('app'); $app = $this->data['app'];
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); echo $this->data['nav']->render();

View File

@ -12,7 +12,7 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
$apps = $this->getData('apps'); $apps = $this->data['apps'];
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); echo $this->data['nav']->render();

View File

@ -12,7 +12,7 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
$app = $this->getData('app'); $app = $this->data['app'];
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); echo $this->data['nav']->render();

View File

@ -15,10 +15,10 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */ /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */
$categories = $this->getData('categories') ?? []; $categories = $this->data['categories'] ?? [];
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
?> ?>
<div class="row"> <div class="row">

View File

@ -4,7 +4,7 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
?> ?>
<div class="row"> <div class="row">

View File

@ -17,15 +17,15 @@ use phpOMS\Utils\Parser\Markdown\Markdown;
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
/** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */ /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */
$categories = $this->getData('categories') ?? []; $categories = $this->data['categories'] ?? [];
/** @var \Modules\Knowledgebase\Models\WikiDoc[] $documents */ /** @var \Modules\Knowledgebase\Models\WikiDoc[] $documents */
$documents = $this->getData('docs') ?? []; $documents = $this->data['docs'] ?? [];
/** @var \Modules\Knowledgebase\Models\WikiApp[] $apps */ /** @var \Modules\Knowledgebase\Models\WikiApp[] $apps */
$apps = $this->getData('apps') ?? []; $apps = $this->data['apps'] ?? [];
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-8 col-lg-9"> <div class="col-xs-12 col-md-8 col-lg-9">
<div class="row"> <div class="row">

View File

@ -22,7 +22,7 @@ $isNewDoc = $wiki->id === 0;
$languages = \phpOMS\Localization\ISO639Enum::getConstants(); $languages = \phpOMS\Localization\ISO639Enum::getConstants();
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-9"> <div class="col-xs-12 col-md-9">

View File

@ -19,7 +19,7 @@ use Modules\Knowledgebase\Models\NullWikiDoc;
* @var \Modules\Knowledgebase\Models\WikiCategory[] $categories * @var \Modules\Knowledgebase\Models\WikiCategory[] $categories
* @var \Modules\Knowledgebase\Models\WikiDoc $doc * @var \Modules\Knowledgebase\Models\WikiDoc $doc
*/ */
$categories = $this->getData('categories') ?? []; $categories = $this->data['categories'] ?? [];
/** @var \Modules\Knowledgebase\Models\WikiDoc $doc */ /** @var \Modules\Knowledgebase\Models\WikiDoc $doc */
$doc = $this->getData('document') ?? new NullWikiDoc(); $doc = $this->getData('document') ?? new NullWikiDoc();
@ -28,10 +28,10 @@ $doc = $this->getData('document') ?? new NullWikiDoc();
$tags = $doc->getTags(); $tags = $doc->getTags();
/** @var bool $editable */ /** @var bool $editable */
$editable = $this->getData('editable'); $editable = $this->data['editable'];
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
?> ?>
<div class="row"> <div class="row">