From 28170aaab7799c35add6f7ef4a4f53222bbe1197 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 03:42:47 +0200 Subject: [PATCH 1/3] use direct data access for response data --- Controller/ApiController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 75fc5e8..4dd6340 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -62,7 +62,7 @@ final class ApiController extends Controller public function apiKanbanCardCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateKanbanCardCreate($request))) { - $response->set('kanban_card_create', new FormValidation($val)); + $response->data['kanban_card_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -118,7 +118,7 @@ final class ApiController extends Controller } } - if (!empty($uploadedFiles = $request->getFiles())) { + if (!empty($uploadedFiles = $request->files)) { $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( [], [], @@ -187,7 +187,7 @@ final class ApiController extends Controller public function apiKanbanCardCommentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateKanbanCardCommentCreate($request))) { - $response->set('kanban_comment_create', new FormValidation($val)); + $response->data['kanban_comment_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -215,7 +215,7 @@ final class ApiController extends Controller $comment->card = (int) $request->getData('card'); $comment->createdBy = new NullAccount($request->header->account); - if (!empty($uploadedFiles = $request->getFiles())) { + if (!empty($uploadedFiles = $request->files)) { $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( [], [], @@ -270,7 +270,7 @@ final class ApiController extends Controller public function apiKanbanBoardCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateKanbanBoardCreate($request))) { - $response->set('kanban_board_create', new FormValidation($val)); + $response->data['kanban_board_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -412,7 +412,7 @@ final class ApiController extends Controller public function apiKanbanColumnCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateKanbanColumnCreate($request))) { - $response->set('kanban_column_create', new FormValidation($val)); + $response->data['kanban_column_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; From c2bea7815f854e401c8cd8a1679fd9be140eb828 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 04:15:37 +0200 Subject: [PATCH 2/3] continue with getter/setter removal --- Controller/BackendController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 859438e..02e9fc9 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -78,7 +78,7 @@ final class BackendController extends Controller $list = KanbanBoardMapper::getAll() ->with('tags') ->with('tags/title') - ->where('tags/title/language', $request->getLanguage()) + ->where('tags/title/language', $request->header->l11n->language) ->sort('createdAt', OrderType::DESC) ->limit(20) ->execute(); @@ -112,7 +112,7 @@ final class BackendController extends Controller ->with('columns/cards/tags') ->with('columns/cards/tags/title') ->where('id', (int) $request->getData('id')) - ->where('columns/cards/tags/title/language', $request->getLanguage()) + ->where('columns/cards/tags/title/language', $request->header->l11n->language) ->execute(); $accountId = $request->header->account; @@ -155,7 +155,7 @@ final class BackendController extends Controller $list = KanbanBoardMapper::getAll() ->with('tags') ->with('tags/title') - ->where('tags/title/language', $request->getLanguage()) + ->where('tags/title/language', $request->header->l11n->language) ->sort('createdAt', OrderType::DESC) ->limit(25) ->execute(); @@ -223,7 +223,7 @@ final class BackendController extends Controller ->with('comments/media') ->with('comments/createdBy') ->where('id', (int) $request->getData('id')) - ->where('tags/title/language', $response->getLanguage()) + ->where('tags/title/language', $response->header->l11n->language) ->execute(); $accountId = $request->header->account; From bc1143dd205b2ae0dd3fdaec86045ab2d697f8ef Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:20 +0200 Subject: [PATCH 3/3] Continue with getter/setter cleanup --- Controller/BackendController.php | 20 ++++++++++---------- Theme/Backend/kanban-archive.tpl.php | 4 ++-- Theme/Backend/kanban-board-create.tpl.php | 2 +- Theme/Backend/kanban-board.tpl.php | 2 +- Theme/Backend/kanban-card.tpl.php | 2 +- Theme/Backend/kanban-dashboard.tpl.php | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 02e9fc9..383c0fe 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -52,7 +52,7 @@ final class BackendController extends Controller public function setupStyles(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { /** @var \phpOMS\Model\Html\Head $head */ - $head = $response->get('Content')->getData('head'); + $head = $response->get('Content')->head; $head->addAsset(AssetType::CSS, '/Modules/Kanban/Theme/Backend/css/styles.css?v=1.0.0'); } @@ -73,7 +73,7 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-dashboard'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response); $list = KanbanBoardMapper::getAll() ->with('tags') @@ -83,7 +83,7 @@ final class BackendController extends Controller ->limit(20) ->execute(); - $view->setData('boards', $list); + $view->data['boards'] = $list; return $view; } @@ -127,9 +127,9 @@ final class BackendController extends Controller } $view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-board'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response); - $view->setData('board', $board); + $view->data['board'] = $board; return $view; } @@ -150,7 +150,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-archive'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response); $list = KanbanBoardMapper::getAll() ->with('tags') @@ -160,7 +160,7 @@ final class BackendController extends Controller ->limit(25) ->execute(); - $view->setData('boards', $list); + $view->data['boards'] = $list; return $view; } @@ -192,7 +192,7 @@ final class BackendController extends Controller } $view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-board-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response); return $view; } @@ -238,8 +238,8 @@ final class BackendController extends Controller } $view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-card'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response)); - $view->setData('card', $card); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response); + $view->data['card'] = $card; return $view; } diff --git a/Theme/Backend/kanban-archive.tpl.php b/Theme/Backend/kanban-archive.tpl.php index 1b892b8..4f4fe79 100755 --- a/Theme/Backend/kanban-archive.tpl.php +++ b/Theme/Backend/kanban-archive.tpl.php @@ -16,12 +16,12 @@ use phpOMS\Uri\UriFactory; /** @var \phpOMS\Views\View $this */ /** @var \Modules\News\Models\NewsArticle[] $boards */ -$boards = $this->getData('boards') ?? []; +$boards = $this->data['boards'] ?? []; $previous = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \reset($boards)->id . '&ptype=p'; $next = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \end($boards)->id . '&ptype=n'; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/kanban-board-create.tpl.php b/Theme/Backend/kanban-board-create.tpl.php index 964e343..085efe4 100755 --- a/Theme/Backend/kanban-board-create.tpl.php +++ b/Theme/Backend/kanban-board-create.tpl.php @@ -11,4 +11,4 @@ * @link https://jingga.app */ declare(strict_types=1); -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/kanban-board.tpl.php b/Theme/Backend/kanban-board.tpl.php index b321969..ef26969 100755 --- a/Theme/Backend/kanban-board.tpl.php +++ b/Theme/Backend/kanban-board.tpl.php @@ -13,7 +13,7 @@ declare(strict_types=1); /** @var \Modules\Kanban\Models\KanbanBoard $board */ -$board = $this->getData('board'); +$board = $this->data['board']; /** @var \Modules\Kanban\Models\KanbanColumn[] $columns */ $columns = $board->getColumns(); diff --git a/Theme/Backend/kanban-card.tpl.php b/Theme/Backend/kanban-card.tpl.php index 0d8770d..ff039ec 100755 --- a/Theme/Backend/kanban-card.tpl.php +++ b/Theme/Backend/kanban-card.tpl.php @@ -15,7 +15,7 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; /** @var \Modules\Kanban\Models\KanbanCard $card */ -$card = $this->getData('card'); +$card = $this->data['card']; $comments = $card->getComments(); ?> diff --git a/Theme/Backend/kanban-dashboard.tpl.php b/Theme/Backend/kanban-dashboard.tpl.php index 20589e2..252eaf8 100755 --- a/Theme/Backend/kanban-dashboard.tpl.php +++ b/Theme/Backend/kanban-dashboard.tpl.php @@ -15,12 +15,12 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; /** @var \Modules\Kanban\Models\KanbanBoard[] $boards */ -$boards = $this->getData('boards'); +$boards = $this->data['boards']; $previous = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \reset($boards)->id . '&ptype=p'; $next = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \end($boards)->id . '&ptype=n'; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>