From b6c9fd95e3cdf74909b36abaa91fe5ffb28f43ed 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 | 8 ++++---- Theme/Backend/Components/Calendar/BaseView.php | 6 +++--- Theme/Backend/Components/Event/BaseView.php | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 85e5336..ecde581 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -52,7 +52,7 @@ final class BackendController extends Controller implements DashboardElementInte */ public function viewCalendarDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); /** @var \phpOMS\Model\Html\Head $head */ $head = $response->get('Content')->getData('head'); @@ -65,7 +65,7 @@ final class BackendController extends Controller implements DashboardElementInte $calendar->setDate(new SmartDateTime((string) ($request->getData('date') ?? 'now'))); $view->addData('calendar', $calendar); - $calendarEventPopup = new \Modules\Calendar\Theme\Backend\Components\Event\BaseView($this->app, $request, $response); + $calendarEventPopup = new \Modules\Calendar\Theme\Backend\Components\Event\BaseView($this->app->l11nManager, $request, $response); $view->addData('calendarEventPopup', $calendarEventPopup); return $view; @@ -80,10 +80,10 @@ final class BackendController extends Controller implements DashboardElementInte $head = $response->get('Content')->getData('head'); $head->addAsset(AssetType::CSS, '/Modules/Calendar/Theme/Backend/css/styles.css'); - $view = new View($this->app, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Calendar/Theme/Backend/dashboard-calendar'); - $calendarView = new \Modules\Calendar\Theme\Backend\Components\Calendar\BaseView($this->app, $request, $response); + $calendarView = new \Modules\Calendar\Theme\Backend\Components\Calendar\BaseView($this->app->l11nManager, $request, $response); $calendarView->setTemplate('/Modules/Calendar/Theme/Backend/Components/Calendar/mini'); $view->addData('calendar', $calendarView); diff --git a/Theme/Backend/Components/Calendar/BaseView.php b/Theme/Backend/Components/Calendar/BaseView.php index 7a50846..7781157 100644 --- a/Theme/Backend/Components/Calendar/BaseView.php +++ b/Theme/Backend/Components/Calendar/BaseView.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\Calendar\Theme\Backend\Components\Calendar; -use phpOMS\ApplicationAbstract; +use phpOMS\Localization\L11nManager; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; @@ -35,9 +35,9 @@ 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/Calendar/Theme/Backend/Components/Calendar/mini'); } diff --git a/Theme/Backend/Components/Event/BaseView.php b/Theme/Backend/Components/Event/BaseView.php index cb50d64..0f6ecf3 100644 --- a/Theme/Backend/Components/Event/BaseView.php +++ b/Theme/Backend/Components/Event/BaseView.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\Calendar\Theme\Backend\Components\Event; -use phpOMS\ApplicationAbstract; +use phpOMS\Localization\L11nManager; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; @@ -35,9 +35,9 @@ 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/Calendar/Theme/Backend/Components/Event/popup'); }