From dc644a7891dd2cd3cbcd3b312ed23d7bc09aa7cd Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 24 Nov 2020 17:31:19 +0100 Subject: [PATCH] remove some getter/setter --- Controller/ApiController.php | 16 ++++++++-------- Controller/BackendController.php | 2 +- Models/DashboardBoard.php | 28 +--------------------------- 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index fdae75b..22dc37b 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -80,14 +80,14 @@ final class ApiController extends Controller public function apiBoardCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void { if (!empty($val = $this->validateBoardCreate($request))) { - $response->set($request->getUri()->__toString(), new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->set($request->uri->__toString(), new FormValidation($val)); + $response->header->status = RequestStatusCode::R_400; return; } $board = $this->createBoardFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $board, DashboardBoardMapper::class, 'board', $request->getOrigin()); + $this->createModel($request->header->account, $board, DashboardBoardMapper::class, 'board', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Board', 'Board successfully created.', $board); } @@ -103,8 +103,8 @@ final class ApiController extends Controller private function createBoardFromRequest(RequestAbstract $request) : DashboardBoard { $board = new DashboardBoard(); - $board->setTitle((string) ($request->getData('title') ?? '')); - $board->setAccount($request->getHeader()->getAccount()); + $board->title = (string) ($request->getData('title') ?? ''); + $board->setAccount($request->header->account); $board->setStatus(DashboardBoardStatus::ACTIVE); return $board; @@ -147,14 +147,14 @@ final class ApiController extends Controller public function apiComponentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void { if (!empty($val = $this->validateComponentCreate($request))) { - $response->set($request->getUri()->__toString(), new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->set($request->uri->__toString(), new FormValidation($val)); + $response->header->status = RequestStatusCode::R_400; return; } $component = $this->createComponentFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $component, DashboardComponentMapper::class, 'component', $request->getOrigin()); + $this->createModel($request->header->account, $component, DashboardComponentMapper::class, 'component', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Component', 'Component successfully created.', $component); } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 095a9b1..cfbfb76 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -62,7 +62,7 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Dashboard/Theme/Backend/dashboard'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000301001, $request, $response)); - $board = DashboardBoardMapper::getFor($request->getHeader()->getAccount(), 'account'); + $board = DashboardBoardMapper::getFor($request->header->account, 'account'); if ($board instanceof NullDashboardBoard) { $board = DashboardBoardMapper::get(1); diff --git a/Models/DashboardBoard.php b/Models/DashboardBoard.php index e0eaeca..d5079e7 100755 --- a/Models/DashboardBoard.php +++ b/Models/DashboardBoard.php @@ -40,7 +40,7 @@ class DashboardBoard implements \JsonSerializable * @var string * @since 1.0.0 */ - protected string $title = ''; + public string $title = ''; /** * Account. @@ -104,32 +104,6 @@ class DashboardBoard implements \JsonSerializable $this->account = $id; } - /** - * Get title - * - * @return string - * - * @since 1.0.0 - */ - public function getTitle() : string - { - return $this->title; - } - - /** - * Set title - * - * @param string $title Title - * - * @return void - * - * @since 1.0.0 - */ - public function setTitle(string $title) : void - { - $this->title = $title; - } - /** * Get status *