From 3d2a1886708df6f555445b115da37aec1a3d7e86 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 6 Feb 2020 23:54:01 +0100 Subject: [PATCH] improve baseline --- Controller/BackendController.php | 10 +++++----- Theme/Backend/Components/Editor/BaseView.php | 8 ++++---- Theme/Backend/Components/Editor/TextView.php | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 6e371fe..c5b10ca 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -67,12 +67,12 @@ final class BackendController extends Controller */ public function viewEditorCreate(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/Editor/Theme/Backend/editor-create'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $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; @@ -92,7 +92,7 @@ final class BackendController extends Controller */ public function viewEditorList(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/Editor/Theme/Backend/editor-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response)); @@ -117,7 +117,7 @@ final class BackendController extends Controller */ public function viewEditorSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $doc = EditorDocMapper::get((int) $request->getData('id')); $accountId = $request->getHeader()->getAccount(); @@ -135,7 +135,7 @@ final class BackendController extends Controller $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response)); $view->addData('doc', $doc); - $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; diff --git a/Theme/Backend/Components/Editor/BaseView.php b/Theme/Backend/Components/Editor/BaseView.php index 49d4e6b..42d515d 100644 --- a/Theme/Backend/Components/Editor/BaseView.php +++ b/Theme/Backend/Components/Editor/BaseView.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\Editor\Theme\Backend\Components\Editor; -use phpOMS\ApplicationAbstract; use phpOMS\Asset\AssetType; +use phpOMS\Localization\L11nManager; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; @@ -42,14 +42,14 @@ class BaseView 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/Editor/Theme/Backend/Components/Editor/inline-editor-tools'); $response->get('Content')->getData('head')->addAsset(AssetType::JSLATE, 'Modules/Editor/Controller.js', ['type' => 'module']); - $view = new TextView($app, $request, $response); + $view = new TextView($l11n, $request, $response); $this->addData('text', $view); } diff --git a/Theme/Backend/Components/Editor/TextView.php b/Theme/Backend/Components/Editor/TextView.php index 64f56bf..dd0b0a1 100644 --- a/Theme/Backend/Components/Editor/TextView.php +++ b/Theme/Backend/Components/Editor/TextView.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\Editor\Theme\Backend\Components\Editor; -use phpOMS\ApplicationAbstract; +use phpOMS\Localization\L11nManager; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; @@ -41,9 +41,9 @@ class TextView 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/Editor/Theme/Backend/Components/Editor/inline-editor'); }