From 0c31e88918fca9823292b14b56e254c3c1852e8d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 6 Feb 2020 23:54:01 +0100 Subject: [PATCH] improve baseline --- Controller/ApiController.php | 14 ++++++---- Controller/BackendController.php | 28 +++++++++---------- Controller/ConsoleController.php | 2 +- .../GroupTagSelectorPopupView.php | 6 ++-- .../GroupTagSelector/GroupTagSelectorView.php | 8 +++--- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 6789e1c..e485be2 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -1021,13 +1021,15 @@ final class ApiController extends Controller { $directories = \glob(__DIR__ . '/../../../Web/*' , \GLOB_ONLYDIR); - foreach ($directories as $directory) { - if (\file_exists($path = $directory . '/Routes.php')) { - \file_put_contents($path, 'app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $settings = $this->app->appSettings->get([ 1000000001, 1000000002, 1000000003, 1000000004, 1000000005, 1000000006, 1000000007, 1000000008, 1000000009, 1000000010, 1000000011, 1000000012, 1000000013, 1000000014, 1000000015, 1000000016, 1000000017, 1000000018, 1000000019, @@ -94,7 +94,7 @@ final class BackendController extends Controller */ public function viewEmptyCommand(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Console/empty-command'); return $view; @@ -113,7 +113,7 @@ final class BackendController extends Controller */ public function viewAccountList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); $view->setData('list:elements', AccountMapper::getNewest(50, null, RelationType::NONE)); @@ -135,7 +135,7 @@ final class BackendController extends Controller */ public function viewAccountSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); $view->addData('account', AccountMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2)); @@ -150,7 +150,7 @@ final class BackendController extends Controller $view->addData('permissions', $permissions); - $accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app, $request, $response); + $accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app->l11nManager, $request, $response); $view->addData('grpSelector', $accGrpSelector); return $view; @@ -169,7 +169,7 @@ final class BackendController extends Controller */ public function viewAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-create'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); @@ -189,7 +189,7 @@ final class BackendController extends Controller */ public function viewGroupList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); $view->setData('list:elements', GroupMapper::getAll(RelationType::NONE)); @@ -210,7 +210,7 @@ final class BackendController extends Controller */ public function viewGroupSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-single'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); $view->addData('group', GroupMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2)); @@ -225,10 +225,10 @@ final class BackendController extends Controller $view->addData('permissions', $permissions); - $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app, $request, $response); + $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); $view->addData('accGrpSelector', $accGrpSelector); - $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response); + $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $view->addData('editor', $editor); return $view; @@ -247,11 +247,11 @@ final class BackendController extends Controller */ public function viewGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-create'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); - $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response); + $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $view->addData('editor', $editor); return $view; @@ -270,7 +270,7 @@ final class BackendController extends Controller */ public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-list'); return $view; @@ -289,7 +289,7 @@ final class BackendController extends Controller */ public function viewModuleProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-single'); $id = $request->getData('id') ?? ''; diff --git a/Controller/ConsoleController.php b/Controller/ConsoleController.php index f8e1372..bd87559 100644 --- a/Controller/ConsoleController.php +++ b/Controller/ConsoleController.php @@ -48,7 +48,7 @@ final class ConsoleController extends Controller */ public function viewEmptyCommand(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Console/empty-command'); return $view; diff --git a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php index 24cf4c6..6210d52 100644 --- a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php +++ b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector; -use phpOMS\ApplicationAbstract; +use phpOMS\Localization\L11nManager; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; @@ -35,9 +35,9 @@ class GroupTagSelectorPopupView extends View /** * {@inheritdoc} */ - public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response) + public function __construct(L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) { - parent::__construct($app, $request, $response); + parent::__construct($l11n, $request, $response); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector-popup'); } diff --git a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php index 66784b9..0efb7f5 100644 --- a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php +++ b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector; -use phpOMS\ApplicationAbstract; +use phpOMS\Localization\L11nManager; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; @@ -36,12 +36,12 @@ class GroupTagSelectorView extends View /** * {@inheritdoc} */ - public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response) + public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response) { - parent::__construct($app, $request, $response); + parent::__construct($l11n, $request, $response); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector'); - $view = new GroupTagSelectorPopupView($app, $request, $response); + $view = new GroupTagSelectorPopupView($l11n, $request, $response); $this->addData('group-selector-popup', $view); }