diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 493a79a..1c803b6 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -1,4 +1,5 @@ createCommentList(); $this->createModel($request->getHeader()->getAccount(), $commentList, CommentListMapper::class, 'comment_list', $request->getOrigin()); @@ -61,7 +63,7 @@ final class ApiController extends Controller * * @since 1.0.0 */ - public function createCommentList() : CommentList + public function createCommentList(): CommentList { $list = new CommentList(); // @todo: allow config @@ -82,10 +84,11 @@ final class ApiController extends Controller * * @since 1.0.0 */ - public function apiCommentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void + public function apiCommentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): void { if (!empty($val = $this->validateCommentCreate($request))) { $response->set('news_create', new FormValidation($val)); + $response->getHeader()->setStatusCode(RequestStatusCode::R_400); return; } @@ -104,7 +107,7 @@ final class ApiController extends Controller * * @since 1.0.0 */ - private function validateCommentCreate(RequestAbstract $request) : array + private function validateCommentCreate(RequestAbstract $request): array { $val = []; if (($val['title'] = empty($request->getData('title'))) @@ -125,7 +128,7 @@ final class ApiController extends Controller * * @since 1.0.0 */ - private function createCommentFromRequest(RequestAbstract $request) : Comment + private function createCommentFromRequest(RequestAbstract $request): Comment { $comment = new Comment(); $comment->setCreatedBy(new NullAccount($request->getHeader()->getAccount())); @@ -151,7 +154,7 @@ final class ApiController extends Controller * * @since 1.0.0 */ - public function apiCommentUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void + public function apiCommentUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null): void { $old = clone CommentMapper::get((int) $request->getData('id')); $new = $this->updateCommentFromRequest($request); @@ -168,7 +171,7 @@ final class ApiController extends Controller * * @since 1.0.0 */ - private function updateCommentFromRequest(RequestAbstract $request) : Comment + private function updateCommentFromRequest(RequestAbstract $request): Comment { $comment = CommentMapper::get((int) $request->getData('id')); $comment->setTitle($request->getData('title') ?? $comment->getTitle()); @@ -192,7 +195,7 @@ final class ApiController extends Controller * * @since 1.0.0 */ - public function apiCommentGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void + public function apiCommentGet(RequestAbstract $request, ResponseAbstract $response, $data = null): void { $comment = CommentMapper::get((int) $request->getData('id')); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Comment', 'Comment successfully returned', $comment); @@ -211,7 +214,7 @@ final class ApiController extends Controller * * @since 1.0.0 */ - public function apiCommentDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void + public function apiCommentDelete(RequestAbstract $request, ResponseAbstract $response, $data = null): void { $comment = CommentMapper::get((int) $request->getData('id')); $this->deleteModel($request->getHeader()->getAccount(), $comment, CommentMapper::class, 'comment', $request->getOrigin()); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index e63d1f9..9155ed3 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -1,4 +1,5 @@ get('Content')->getData('head'); $head->addAsset(AssetType::JS, '/Modules/Editor/Controller.js', ['type' => 'module']); @@ -63,7 +65,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewCommentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewCommentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Comments/Theme/Backend/comment-create'); @@ -84,7 +86,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewCommentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewCommentList(RequestAbstract $request, ResponseAbstract $response, $data = null): RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Comments/Theme/Backend/comment-list'); @@ -102,7 +104,7 @@ final class BackendController extends Controller * * @since 1.0.0 */ - private function validateCommentCreate(RequestAbstract $request) : array + private function validateCommentCreate(RequestAbstract $request): array { $val = []; if (($val['title'] = empty($request->getData('title'))) @@ -127,10 +129,11 @@ final class BackendController extends Controller * * @since 1.0.0 */ - public function apiCommentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void + public function apiCommentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): void { if (!empty($val = $this->validateCommentCreate($request))) { $response->set('comment_create', new FormValidation($val)); + $response->getHeader()->setStatusCode(RequestStatusCode::R_400); return; }