From 4e66d0d80709f841148aaf6c951689cea65bdd86 Mon Sep 17 00:00:00 2001 From: Arman <407448+armanist@users.noreply.github.com> Date: Fri, 1 May 2026 22:06:02 +0400 Subject: [PATCH 1/8] [#496] Refactor template controllers to use response() helper --- .../src/Controllers/MainController.php.tpl | 7 ++- .../OpenApi/OpenApiMainController.php.tpl | 4 +- .../src/Controllers/MainController.php.tpl | 9 ++-- .../src/Controllers/AccountController.php.tpl | 16 +++---- .../src/Controllers/AuthController.php.tpl | 44 ++++++++----------- .../src/Controllers/CommentController.php.tpl | 10 ++--- .../OpenApi/OpenApiAuthController.php.tpl | 27 ++++-------- .../OpenApi/OpenApiPostController.php.tpl | 21 +++------ .../src/Controllers/PostController.php.tpl | 10 ++--- .../PostManagementController.php.tpl | 31 +++++++------ .../src/Controllers/AccountController.php.tpl | 7 ++- .../src/Controllers/AuthController.php.tpl | 20 ++++----- .../src/Controllers/PageController.php.tpl | 14 +++--- .../src/Controllers/PostController.php.tpl | 18 ++++---- .../PostManagementController.php.tpl | 23 +++++----- .../Controllers/DashboardController.php.tpl | 5 +-- .../Controllers/DatabaseController.php.tpl | 10 ++--- .../src/Controllers/EmailsController.php.tpl | 10 ++--- .../src/Controllers/LogsController.php.tpl | 10 ++--- 19 files changed, 124 insertions(+), 172 deletions(-) diff --git a/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl b/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl index 1040b5cf..6d401b9d 100644 --- a/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl +++ b/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl @@ -37,14 +37,13 @@ class MainController * @var bool */ public bool $csrfVerification = false; - + /** * Action - success response - * @param Response $response */ - public function index(Response $response): Response + public function index(): Response { - return $response->json([ + return response()->json([ 'status' => 'success', 'message' => '{{MODULE_NAME}} module.' ]); diff --git a/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiMainController.php.tpl b/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiMainController.php.tpl index 7653c7a7..21bcda20 100644 --- a/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiMainController.php.tpl +++ b/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiMainController.php.tpl @@ -22,7 +22,7 @@ use Quantum\Http\Response; */ abstract class OpenApiMainController extends OpenApiController { - + /** * @OA\Get( * path="/{{MODULE_NAME}}", @@ -40,6 +40,6 @@ abstract class OpenApiMainController extends OpenApiController * ) * ) */ - abstract public function index(Response $response); + abstract public function index(); } diff --git a/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl b/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl index 869fc18d..09754b05 100644 --- a/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl +++ b/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl @@ -41,18 +41,17 @@ class MainController new Asset(Asset::CSS, '{{MODULE_NAME}}/css/custom.css') ]); } - + /** * Action - display home page - * @param Response $response * @param ViewFactory $view */ - public function index(Response $response, ViewFactory $view): Response - { + public function index(ViewFactory $view): Response + { $view->setParams([ 'title' => config()->get('app.name'), ]); - + return $response->html($view->render('index')); } } diff --git a/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl index 44d56212..4f971f59 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl @@ -31,7 +31,7 @@ class AccountController extends BaseController * @var AuthService */ public AuthService $authService; - + /** * Works before an action */ @@ -44,9 +44,8 @@ class AccountController extends BaseController /** * Action - update user info * @param Request $request - * @param Response $response */ - public function update(Request $request, Response $response): Response + public function update(Request $request): Response { try { $firstname = $request->get('firstname'); @@ -59,7 +58,7 @@ class AccountController extends BaseController auth()->refreshUser(auth()->user()->uuid); - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS, 'message' => t('common.updated_successfully') ]); @@ -74,20 +73,19 @@ class AccountController extends BaseController /** * Action - update password * @param Request $request - * @param Response $response */ - public function updatePassword(Request $request, Response $response): Response + public function updatePassword(Request $request): Response { try { $hasher = new Hasher(); - + $newPassword = $request->get('new_password'); - + $this->authService->update('uuid', auth()->user()->uuid, [ 'password' => $hasher->hash($newPassword) ]); - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS, 'message' => t('common.updated_successfully') ]); diff --git a/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl index 76f6a022..b2916528 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl @@ -31,11 +31,11 @@ class AuthController extends BaseController /** * Action - sign in * @param Request $request - * @param Response $response * @return Response */ - public function signin(Request $request, Response $response): Response + public function signin(Request $request): Response { + $response = response(); try { $code = auth()->signin($request->get('email'), $request->get('password')); @@ -56,12 +56,11 @@ class AuthController extends BaseController /** * Action - me - * @param Response $response * @return Response */ - public function me(Response $response): Response + public function me(): Response { - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS, 'data' => [ 'firstname' => auth()->user()->firstname, @@ -73,13 +72,12 @@ class AuthController extends BaseController /** * Action - sign out - * @param Response $response * @return Response */ - public function signout(Response $response): Response + public function signout(): Response { if (auth()->signout()) { - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS ]); } else { @@ -93,16 +91,15 @@ class AuthController extends BaseController /** * Action - sign up * @param Request $request - * @param Response $response * @return Response */ - public function signup(Request $request, Response $response): Response + public function signup(Request $request): Response { $userDto = UserDTO::fromRequest($request, Role::EDITOR, uuid_ordered()); auth()->signup($userDto->toArray()); - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS, 'message' => t('common.successfully_signed_up') ]); @@ -111,14 +108,13 @@ class AuthController extends BaseController /** * Action - activate * @param Request $request - * @param Response $response * @return Response */ - public function activate(Request $request, Response $response): Response + public function activate(Request $request): Response { auth()->activate($request->get('activation_token')); - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS, 'message' => t('common.account_activated') ]); @@ -127,14 +123,13 @@ class AuthController extends BaseController /** * Action - forget * @param Request $request - * @param Response $response * @return Response */ - public function forget(Request $request, Response $response): Response + public function forget(Request $request): Response { auth()->forget($request->get('email')); - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS, 'message' => t('common.check_email') ]); @@ -143,14 +138,13 @@ class AuthController extends BaseController /** * Action - reset * @param Request $request - * @param Response $response * @return Response */ - public function reset(Request $request, Response $response): Response + public function reset(Request $request): Response { auth()->reset($request->get('reset_token'), $request->get('password')); - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS ]); } @@ -158,15 +152,14 @@ class AuthController extends BaseController /** * Action - Verify OTP * @param Request $request - * @param Response $response * @return Response */ - public function verify(Request $request, Response $response): Response + public function verify(Request $request): Response { try { auth()->verifyOtp((int)$request->get('otp'), $request->get('code')); - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS ]); } catch (AuthException $e) { @@ -179,13 +172,12 @@ class AuthController extends BaseController /** * Action - Resend OTP - * @param Response $response * @return Response */ - public function resend(Response $response): Response + public function resend(): Response { try { - return $response->json([ + return response()->json([ 'status' => self::STATUS_SUCCESS, 'code' => auth()->resendOtp(route_param('code')) ]); diff --git a/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl index f1d0b030..3190d784 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl @@ -39,17 +39,16 @@ class CommentController extends BaseController /** * Action - create comment * @param Request $request - * @param Response $response * @param string|null $lang * @param string $uuid */ - public function create(Request $request, Response $response, ?string $lang, string $uuid): Response + public function create(Request $request, ?string $lang, string $uuid): Response { $commentDto = CommentDTO::fromRequest($request, $uuid, auth()->user()->uuid); $comment = $this->commentService->addComment($commentDto); - return $response->json([ + return response()->json([ 'status' => 'success', 'message' => t('common.created_successfully'), 'data' => $comment @@ -58,15 +57,14 @@ class CommentController extends BaseController /** * Action - delete comment - * @param Response $response * @param string|null $lang * @param string $uuid */ - public function delete(Response $response, ?string $lang, string $uuid): Response + public function delete(?string $lang, string $uuid): Response { $this->commentService->deleteComment($uuid); - return $response->json([ + return response()->json([ 'status' => 'success', 'message' => t('common.deleted_successfully'), ]); diff --git a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl index fc5b829e..045c12d8 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl @@ -64,9 +64,8 @@ abstract class OpenApiAuthController extends OpenApiController * ) * ) * @param Request $request - * @param Response $response */ - abstract public function signin(Request $request, Response $response); + abstract public function signin(Request $request); /** * Gets the logged-in user data @@ -94,9 +93,8 @@ abstract class OpenApiAuthController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Response $response */ - abstract public function me(Response $response); + abstract public function me(); /** * Sign out action @@ -134,9 +132,8 @@ abstract class OpenApiAuthController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Response $response */ - abstract public function signout(Response $response); + abstract public function signout(); /** * Sign up action @@ -186,9 +183,8 @@ abstract class OpenApiAuthController extends OpenApiController * ) * ) * @param Request $request - * @param Response $response */ - abstract public function signup(Request $request, Response $response); + abstract public function signup(Request $request); /** * Activate action @@ -223,9 +219,8 @@ abstract class OpenApiAuthController extends OpenApiController * ) * ) * @param Request $request - * @param Response $response */ - abstract public function activate(Request $request, Response $response); + abstract public function activate(Request $request); /** * Forget action @@ -263,9 +258,8 @@ abstract class OpenApiAuthController extends OpenApiController * ) * ) * @param Request $request - * @param Response $response */ - abstract public function forget(Request $request, Response $response); + abstract public function forget(Request $request); /** * Reset action @@ -316,9 +310,8 @@ abstract class OpenApiAuthController extends OpenApiController * ) * ) * @param Request $request - * @param Response $response */ - abstract public function reset(Request $request, Response $response); + abstract public function reset(Request $request); /** * Verify action @@ -356,9 +349,8 @@ abstract class OpenApiAuthController extends OpenApiController * ) * ) * @param Request $request - * @param Response $response */ - abstract public function verify(Request $request, Response $response); + abstract public function verify(Request $request); /** * Resend action @@ -392,7 +384,6 @@ abstract class OpenApiAuthController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Response $response */ - abstract public function resend(Response $response); + abstract public function resend(); } diff --git a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl index 19a6bfd9..eed56864 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl @@ -44,9 +44,8 @@ abstract class OpenApiPostController extends OpenApiController * ) * ) * @param Request $request - * @param Response $response */ - abstract public function posts(Request $request, Response $response); + abstract public function posts(Request $request); /** * Get post action @@ -82,9 +81,8 @@ abstract class OpenApiPostController extends OpenApiController * ) * @param string|null $lang * @param string $postId - * @param Response $response */ - abstract public function post(?string $lang, string $postId, Response $response); + abstract public function post(?string $lang, string $postId); /** * Get my posts action @@ -112,9 +110,8 @@ abstract class OpenApiPostController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Response $response */ - abstract public function myPosts(Response $response); + abstract public function myPosts(); /** * Create post action @@ -168,9 +165,8 @@ abstract class OpenApiPostController extends OpenApiController * ) * ) * @param Request $request - * @param Response $response */ - abstract public function create(Request $request, Response $response); + abstract public function create(Request $request); /** * Amend post action @@ -233,11 +229,10 @@ abstract class OpenApiPostController extends OpenApiController * ) * ) * @param Request $request - * @param Response $response * @param string|null $lang * @param string $postId */ - abstract public function amend(Request $request, Response $response, ?string $lang, string $postId); + abstract public function amend(Request $request, ?string $lang, string $postId); /** * Delete post action @@ -278,11 +273,10 @@ abstract class OpenApiPostController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Response $response * @param string|null $lang * @param string $postId */ - abstract public function delete(Response $response, ?string $lang, string $postId); + abstract public function delete(?string $lang, string $postId); /** * Delete post image action @@ -323,10 +317,9 @@ abstract class OpenApiPostController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Response $response * @param string|null $lang * @param string $postId */ - abstract public function deleteImage(Response $response, ?string $lang, string $postId); + abstract public function deleteImage(?string $lang, string $postId); } diff --git a/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl index cf51e13b..347ec9dd 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl @@ -53,10 +53,9 @@ class PostController extends BaseController /** * Action - get posts list * @param Request $request - * @param Response $response * @return Response */ - public function posts(Request $request, Response $response): Response + public function posts(Request $request): Response { $perPage = $request->get('per_page', (string) self::POSTS_PER_PAGE); $currentPage = $request->get('page', (string) self::CURRENT_PAGE); @@ -64,7 +63,7 @@ class PostController extends BaseController $paginatedPosts = $this->postService->getPosts($perPage, $currentPage, $search); - return $response->json([ + return response()->json([ 'status' => 'success', 'data' => $this->postService->transformData($paginatedPosts->data()->all()), 'pagination' => [ @@ -78,17 +77,16 @@ class PostController extends BaseController /** * Action - get single post - * @param Response $response * @param string|null $lang * @param string $postUuid * @return Response */ - public function post(Response $response, ?string $lang, string $postUuid): Response + public function post(?string $lang, string $postUuid): Response { $post = $this->postService->getPost($postUuid); if ($post->isEmpty()) { - return $response->json([ + return response()->json([ 'status' => 'error', 'message' => t('common.post_not_found') ], StatusCode::NOT_FOUND); diff --git a/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl index 1b0cb16c..32671533 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl @@ -42,14 +42,13 @@ class PostManagementController extends BaseController /** * Action - get my posts - * @param Response $response * @return Response */ - public function myPosts(Response $response): Response + public function myPosts(): Response { $myPosts = $this->postService->getMyPosts(auth()->user()->uuid); - - return $response->json([ + + return response()->json([ 'status' => 'success', 'data' => $this->postService->transformData($myPosts->all()) ]); @@ -57,12 +56,12 @@ class PostManagementController extends BaseController /** * Action - create post - * @param Request $request - * @param Response $response + * @param Request $request * @return Response */ - public function create(Request $request, Response $response): Response + public function create(Request $request): Response { + $response = response(); $imageName = ''; if ($request->hasFile('image')) { @@ -85,15 +84,15 @@ class PostManagementController extends BaseController } /** - * Action - amend post - * @param Request $request - * @param Response $response + * Action - amend post + * @param Request $request * @param string|null $lang * @param string $postUuid * @return Response */ - public function amend(Request $request, Response $response, ?string $lang, string $postUuid): Response + public function amend(Request $request, ?string $lang, string $postUuid): Response { + $response = response(); $post = $this->postService->getPost($postUuid); $imageName = null; @@ -123,13 +122,13 @@ class PostManagementController extends BaseController /** * Action - delete post - * @param Response $response * @param string|null $lang * @param string $postUuid * @return Response */ - public function delete(Response $response, ?string $lang, string $postUuid): Response + public function delete(?string $lang, string $postUuid): Response { + $response = response(); $post = $this->postService->getPost($postUuid); if ($post->image) { @@ -146,13 +145,13 @@ class PostManagementController extends BaseController /** * Action - delete image of the post - * @param Response $response - * @param string|null $lang + * @param string|null $lang * @param string $postUuid * @return Response */ - public function deleteImage(Response $response, ?string $lang, string $postUuid): Response + public function deleteImage(?string $lang, string $postUuid): Response { + $response = response(); $post = $this->postService->getPost($postUuid); if ($post->image) { diff --git a/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl index 7a51a07f..19ab8ddf 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl @@ -44,16 +44,15 @@ class AccountController extends BaseController /** * Action - show user info - * @param Response $response * @return Response */ - public function form(Response $response): Response + public function form(): Response { $this->view->setParams([ 'title' => t('common.account_settings') . ' | ' . config()->get('app.name'), ]); - return $response->html($this->view->render('account/form')); + return response()->html($this->view->render('account/form')); } /** @@ -86,7 +85,7 @@ class AccountController extends BaseController $hasher = new Hasher(); $newPassword = $request->get('new_password', null); - + $this->authService->update('uuid', auth()->user()->uuid, [ 'password' => $hasher->hash($newPassword) ]); diff --git a/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl index 69992534..ccd217c0 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl @@ -60,11 +60,11 @@ class AuthController extends BaseController /** * Action - sign in * @param Request $request - * @param Response $response * @return Response */ - public function signin(Request $request, Response $response): Response + public function signin(Request $request): Response { + $response = response(); if ($request->isMethod('post')) { try { $code = auth()->signin($request->get('email'), $request->get('password'), !!$request->get('remember')); @@ -100,11 +100,11 @@ class AuthController extends BaseController /** * Action - sign up * @param Request $request - * @param Response $response * @return Response */ - public function signup(Request $request, Response $response): Response + public function signup(Request $request): Response { + $response = response(); if ($request->isMethod('post')) { $userDto = UserDTO::fromRequest($request, Role::EDITOR, uuid_ordered()); @@ -136,11 +136,11 @@ class AuthController extends BaseController /** * Action - forget * @param Request $request - * @param Response $response * @return Response */ - public function forget(Request $request, Response $response): Response + public function forget(Request $request): Response { + $response = response(); if ($request->isMethod('post')) { auth()->forget($request->get('email')); session()->setFlash('success', t('common.check_email')); @@ -157,11 +157,11 @@ class AuthController extends BaseController /** * Action - reset * @param Request $request - * @param Response $response * @return Response */ - public function reset(Request $request, Response $response): Response + public function reset(Request $request): Response { + $response = response(); if ($request->isMethod('post')) { auth()->reset($request->get('reset_token'), $request->get('password')); return redirect(base_url(true) . '/' . current_lang() . '/signin'); @@ -178,11 +178,11 @@ class AuthController extends BaseController /** * Action - Verify OTP * @param Request $request - * @param Response $response * @return Response */ - public function verify(Request $request, Response $response): Response + public function verify(Request $request): Response { + $response = response(); if ($request->isMethod('post')) { try { auth()->verifyOtp((int)$request->get('otp'), $request->get('code')); diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PageController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PageController.php.tpl index 505679a3..ecb4e2e4 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PageController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PageController.php.tpl @@ -30,23 +30,21 @@ class PageController extends BaseController protected const LAYOUT = 'layouts/main'; /** - * Action - display home page - * @param Response $response + * Action - display home page */ - public function home(Response $response): Response + public function home(): Response { $this->view->setParams([ 'title' => config()->get('app.name'), ]); - return $response->html($this->view->render('pages/index')); + return response()->html($this->view->render('pages/index')); } /** - * Action - display about page - * @param Response $response + * Action - display about page */ - public function about(Response $response): Response + public function about(): Response { $this->view->setParams([ 'title' => t('common.about') . ' | ' . config()->get('app.name'), @@ -54,6 +52,6 @@ class PageController extends BaseController $commands = service(CommandService::class)->getAllCommands(); - return $response->html($this->view->render('pages/about', ['commands' => $commands])); + return response()->html($this->view->render('pages/about', ['commands' => $commands])); } } diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl index c0a45b2c..0667735e 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl @@ -37,12 +37,12 @@ class PostController extends BaseController * Current page */ protected const CURRENT_PAGE = 1; - + /** * Main layout */ protected const LAYOUT = 'layouts/main'; - + /** * Post service * @var PostService @@ -58,10 +58,9 @@ class PostController extends BaseController /** * Action - get posts list * @param Request $request - * @param Response $response * @return Response */ - public function posts(Request $request, Response $response): Response + public function posts(Request $request): Response { $perPage = $request->get('per_page', (string) self::POSTS_PER_PAGE); $currentPage = $request->get('page', (string) self::CURRENT_PAGE); @@ -76,25 +75,24 @@ class PostController extends BaseController 'referer' => nav_ref_encode(request()->getQuery()) ]); - return $response->html($this->view->render('post/post')); + return response()->html($this->view->render('post/post')); } /** * Action - get single post * @param Request $request - * @param Response $response * @param string|null $lang * @param string $postUuid * @return Response */ - public function post(Request $request, Response $response, ?string $lang, string $postUuid): Response + public function post(Request $request, ?string $lang, string $postUuid): Response { $ref = $request->get('ref', 'posts'); - + $post = $this->postService->getPost($postUuid); - + if ($post->isEmpty()) { - return $response->html(partial('errors/404'), StatusCode::NOT_FOUND); + return response()->html(partial('errors/404'), StatusCode::NOT_FOUND); } $commentService = service(CommentService::class); diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl index a773d1f1..3d884cfc 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl @@ -25,12 +25,12 @@ use Quantum\Http\Request; */ class PostManagementController extends BaseController { - + /** * Main layout */ protected const LAYOUT = 'layouts/main'; - + /** * Post service * @var PostService @@ -46,10 +46,9 @@ class PostManagementController extends BaseController /** * Action - get my posts * @param Request $request - * @param Response $response * @return Response */ - public function myPosts(Request $request, Response $response): Response + public function myPosts(Request $request): Response { $myPosts = $this->postService->getMyPosts(auth()->user()->uuid); @@ -58,16 +57,15 @@ class PostManagementController extends BaseController 'posts' => $this->postService->transformData($myPosts->all()) ]); - return $response->html($this->view->render('post/my-posts')); + return response()->html($this->view->render('post/my-posts')); } /** * Action - display form for creating a post * @param Request $request - * @param Response $response * @return Response */ - public function createFrom(Request $request, Response $response): Response + public function createFrom(Request $request): Response { $ref = $request->get('ref', 'posts'); @@ -76,7 +74,7 @@ class PostManagementController extends BaseController 'referer' => $ref ]); - return $response->html($this->view->render('post/form')); + return response()->html($this->view->render('post/form')); } /** @@ -104,14 +102,13 @@ class PostManagementController extends BaseController } /** - * Action - display form for amend the post + * Action - display form for amend the post * @param Request $request - * @param Response $response * @param string|null $lang * @param string $postUuid * @return Response */ - public function amendForm(Request $request, Response $response, ?string $lang, string $postUuid): Response + public function amendForm(Request $request, ?string $lang, string $postUuid): Response { $ref = $request->get('ref', 'posts'); @@ -123,11 +120,11 @@ class PostManagementController extends BaseController 'referer' => nav_ref_decode($ref) ]); - return $response->html($this->view->render('post/form')); + return response()->html($this->view->render('post/form')); } /** - * Action - amend post + * Action - amend post * @param Request $request * @param string|null $lang * @param string $postUuid diff --git a/src/Module/Templates/Toolkit/src/Controllers/DashboardController.php.tpl b/src/Module/Templates/Toolkit/src/Controllers/DashboardController.php.tpl index 0cbee3db..bde95939 100644 --- a/src/Module/Templates/Toolkit/src/Controllers/DashboardController.php.tpl +++ b/src/Module/Templates/Toolkit/src/Controllers/DashboardController.php.tpl @@ -45,14 +45,13 @@ class DashboardController extends BaseController /** * @param Request $request - * @param Response $response */ - public function index(Request $request, Response $response): Response + public function index(Request $request): Response { $this->view->setParams([ 'title' => 'Dashboard', ]); - return $response->html($this->view->render('pages/dashboard/index')); + return response()->html($this->view->render('pages/dashboard/index')); } } diff --git a/src/Module/Templates/Toolkit/src/Controllers/DatabaseController.php.tpl b/src/Module/Templates/Toolkit/src/Controllers/DatabaseController.php.tpl index 68a45200..ebd71894 100644 --- a/src/Module/Templates/Toolkit/src/Controllers/DatabaseController.php.tpl +++ b/src/Module/Templates/Toolkit/src/Controllers/DatabaseController.php.tpl @@ -41,10 +41,9 @@ class DatabaseController extends BaseController } /** - * @param Response $response * @return Response */ - public function list(Response $response): Response + public function list(): Response { $tables = $this->databaseService->getTables(); @@ -53,15 +52,14 @@ class DatabaseController extends BaseController 'tables' => $tables, ]); - return $response->html($this->view->render('pages/database/index')); + return response()->html($this->view->render('pages/database/index')); } /** * @param Request $request - * @param Response $response * @throws DatabaseException */ - public function single(Request $request, Response $response): Response + public function single(Request $request): Response { $tableName = $request->get('table'); $perPage = $request->get('per_page', self::ITEMS_PER_PAGE); @@ -79,7 +77,7 @@ class DatabaseController extends BaseController 'pagination' => $tableData['pagination'], ]); - return $response->html($this->view->render('pages/database/table')); + return response()->html($this->view->render('pages/database/table')); } /** diff --git a/src/Module/Templates/Toolkit/src/Controllers/EmailsController.php.tpl b/src/Module/Templates/Toolkit/src/Controllers/EmailsController.php.tpl index 3076e2d8..22690419 100644 --- a/src/Module/Templates/Toolkit/src/Controllers/EmailsController.php.tpl +++ b/src/Module/Templates/Toolkit/src/Controllers/EmailsController.php.tpl @@ -45,9 +45,8 @@ class EmailsController extends BaseController /** * @param Request $request - * @param Response $response */ - public function list(Request $request, Response $response): Response + public function list(Request $request): Response { $perPage = $request->get('per_page', self::ITEMS_PER_PAGE); $currentPage = $request->get('page', self::CURRENT_PAGE); @@ -60,18 +59,17 @@ class EmailsController extends BaseController 'pagination' => $data ]); - return $response->html($this->view->render('pages/email/index')); + return response()->html($this->view->render('pages/email/index')); } /** - * @param Response $response * @param string $emailId */ - public function single(Response $response, string $emailId): Response + public function single(string $emailId): Response { $email = $this->emailService->getEmail($emailId); - return $response->html(quoted_printable_decode($email->getParsedBody())); + return response()->html(quoted_printable_decode($email->getParsedBody())); } /** diff --git a/src/Module/Templates/Toolkit/src/Controllers/LogsController.php.tpl b/src/Module/Templates/Toolkit/src/Controllers/LogsController.php.tpl index 8383bec7..f95eaf23 100644 --- a/src/Module/Templates/Toolkit/src/Controllers/LogsController.php.tpl +++ b/src/Module/Templates/Toolkit/src/Controllers/LogsController.php.tpl @@ -44,9 +44,8 @@ class LogsController extends BaseController } /** - * @param Response $response */ - public function list(Response $response): Response + public function list(): Response { $filteredLogFiles = $this->logsService->getLogFiles(); @@ -55,14 +54,13 @@ class LogsController extends BaseController 'logFiles' => $filteredLogFiles, ]); - return $response->html($this->view->render('pages/logs/index')); + return response()->html($this->view->render('pages/logs/index')); } /** * @param Request $request - * @param Response $response */ - public function single(Request $request, Response $response): Response + public function single(Request $request): Response { $logFile = $request->get('logFile'); $perPage = $request->get('per_page', self::ITEMS_PER_PAGE); @@ -78,6 +76,6 @@ class LogsController extends BaseController 'pagination' => $parsedLogs, ]); - return $response->html($this->view->render('pages/logs/log')); + return response()->html($this->view->render('pages/logs/log')); } } From 1cdaaa83db0f9b92a2db32dd8ea036d1361cc3c9 Mon Sep 17 00:00:00 2001 From: Arman <407448+armanist@users.noreply.github.com> Date: Fri, 1 May 2026 22:09:41 +0400 Subject: [PATCH 2/8] [#496] Refactor template middleware helpers to remove Response arg plumbing --- .../DemoApi/src/Middlewares/Activate.php.tpl | 4 +--- .../Templates/DemoApi/src/Middlewares/Auth.php.tpl | 8 ++------ .../DemoApi/src/Middlewares/BaseMiddleware.php.tpl | 12 ++++-------- .../DemoApi/src/Middlewares/Comment.php.tpl | 4 +--- .../DemoApi/src/Middlewares/CommentOwner.php.tpl | 4 +--- .../Templates/DemoApi/src/Middlewares/Editor.php.tpl | 8 ++------ .../Templates/DemoApi/src/Middlewares/Forget.php.tpl | 4 +--- .../DemoApi/src/Middlewares/Password.php.tpl | 4 +--- .../DemoApi/src/Middlewares/PostOwner.php.tpl | 4 +--- .../Templates/DemoApi/src/Middlewares/Resend.php.tpl | 4 +--- .../Templates/DemoApi/src/Middlewares/Reset.php.tpl | 4 +--- .../DemoApi/src/Middlewares/Signout.php.tpl | 8 ++------ .../Templates/DemoApi/src/Middlewares/Signup.php.tpl | 4 +--- .../Templates/DemoApi/src/Middlewares/Update.php.tpl | 4 +--- .../Templates/DemoApi/src/Middlewares/Verify.php.tpl | 4 +--- .../DemoWeb/src/Middlewares/Activate.php.tpl | 8 +++----- .../Templates/DemoWeb/src/Middlewares/Auth.php.tpl | 1 - .../DemoWeb/src/Middlewares/BaseMiddleware.php.tpl | 10 ++++------ .../DemoWeb/src/Middlewares/Comment.php.tpl | 8 ++------ .../DemoWeb/src/Middlewares/CommentOwner.php.tpl | 4 +--- .../Templates/DemoWeb/src/Middlewares/Editor.php.tpl | 6 ++---- .../Templates/DemoWeb/src/Middlewares/Forget.php.tpl | 8 ++------ .../Templates/DemoWeb/src/Middlewares/Guest.php.tpl | 1 - .../DemoWeb/src/Middlewares/Password.php.tpl | 6 ++---- .../DemoWeb/src/Middlewares/PostOwner.php.tpl | 8 +++----- .../Templates/DemoWeb/src/Middlewares/Resend.php.tpl | 8 ++------ .../Templates/DemoWeb/src/Middlewares/Reset.php.tpl | 8 +++----- .../Templates/DemoWeb/src/Middlewares/Signup.php.tpl | 6 ++---- .../Templates/DemoWeb/src/Middlewares/Update.php.tpl | 8 ++------ .../Templates/DemoWeb/src/Middlewares/Verify.php.tpl | 8 +++----- .../Toolkit/src/Middlewares/BaseMiddleware.php.tpl | 8 +++----- .../Toolkit/src/Middlewares/BasicAuth.php.tpl | 8 +++----- .../Toolkit/src/Middlewares/CreateTable.php.tpl | 6 ++---- 33 files changed, 60 insertions(+), 140 deletions(-) diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl index e2d2eb32..71ae92ef 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl @@ -29,18 +29,16 @@ class Activate extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $token = (string)route_param('token'); $request->set('token', $token); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl index 7e4218f2..0291d528 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl @@ -25,20 +25,16 @@ use Closure; */ class Auth extends BaseMiddleware { - + /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); if (!auth()->check()) { - $this->respondWithError( - $request, - $response, + $this->respondWithError($request, t('validation.unauthorizedRequest'), StatusCode::UNAUTHORIZED ); diff --git a/src/Module/Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl index cdbea3d0..10d89e52 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl @@ -56,13 +56,12 @@ abstract class BaseMiddleware extends QtMiddleware /** * Validate the request and respond with error if invalid. * @param Request $request - * @param Response $response * @return Response|null */ - protected function validateRequest(Request $request, Response $response): ?Response + protected function validateRequest(Request $request): ?Response { if (!$this->validator->isValid($request->all())) { - return $this->respondWithError($request, $response, $this->validator->getErrors()); + return $this->respondWithError($request, $this->validator->getErrors()); } return null; @@ -71,19 +70,16 @@ abstract class BaseMiddleware extends QtMiddleware /** * Handles error response logic. * @param Request $request - * @param Response $response * @param mixed $message * @param int $status * @return Response */ - protected function respondWithError( - Request $request, - Response $response, + protected function respondWithError(Request $request, $message, int $status = StatusCode::UNPROCESSABLE_ENTITY ): Response { - return $response->json([ + return response()->json([ 'status' => 'error', 'message' => $message, ], $status); diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl index d8b4a09b..2cd0f670 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl @@ -28,13 +28,11 @@ class Comment extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next */ public function apply(Request $request, Closure $next): Response { - $response = response(); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl index bdcdc58b..1f330851 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl @@ -29,18 +29,16 @@ class CommentOwner extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $uuid = (string)route_param('uuid'); $request->set('uuid', $uuid); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl index 06d34fd3..1e8f8cbd 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl @@ -44,24 +44,20 @@ class Editor extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); if (!in_array(auth()->user()->role, self::ROLES)) { - return $this->respondWithError( - $request, - $response, + return $this->respondWithError($request, t('validation.unauthorizedRequest'), StatusCode::UNAUTHORIZED ); } if ($request->isMethod('post') || $request->isMethod('put')) { - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl index bea4c628..cf60e1ff 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl @@ -30,15 +30,13 @@ class Forget extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); if ($request->isMethod('post')) { - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl index e202988f..33658d90 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl @@ -30,14 +30,12 @@ class Password extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next */ public function apply(Request $request, Closure $next): Response { - $response = response(); if ($request->isMethod('post')) { - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl index c0597c1d..6841bc94 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl @@ -29,18 +29,16 @@ class PostOwner extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $uuid = (string)route_param('uuid'); $request->set('uuid', $uuid); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl index 7c630acf..1006507b 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl @@ -29,18 +29,16 @@ class Resend extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $code = (string) route_param('code'); $request->set('code', $code); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl index f52ca4eb..02500bd1 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl @@ -29,18 +29,16 @@ class Reset extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $token = (string) route_param('token'); $request->set('token', $token); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl index 6c9a295a..19e7b8b3 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl @@ -11,7 +11,7 @@ * @link http://quantum.softberg.org/ * @since 2.9.8 */ - + namespace {{MODULE_NAMESPACE}}\Middlewares; use Quantum\Http\Response; @@ -27,17 +27,13 @@ class Signout extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); if (!$request->hasHeader('refresh_token')) { - $this->respondWithError( - $request, - $response, + $this->respondWithError($request, [t('validation.nonExistingRecord', 'token')] ); } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl index 19dd2669..408d6e05 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl @@ -30,14 +30,12 @@ class Signup extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl index afadb9d4..039f7945 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl @@ -29,14 +29,12 @@ class Update extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next */ public function apply(Request $request, Closure $next): Response { - $response = response(); if ($request->isMethod('post')) { - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } } diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl index 96e457a0..c5e4db2b 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl @@ -30,15 +30,13 @@ class Verify extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); if ($request->isMethod('post')) { - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } } diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl index 402c0ee7..3fa17dde 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl @@ -30,18 +30,16 @@ class Activate extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $token = (string)route_param('token'); $request->set('token', $token); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } @@ -66,8 +64,8 @@ class Activate extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError(Request $request, Response $response, $message): Response + protected function respondWithError(Request $request, $message): Response { - return $response->html(partial('errors/404'), StatusCode::NOT_FOUND); + return response()->html(partial('errors/404'), StatusCode::NOT_FOUND); } } diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl index 781db573..f26ca9cc 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl @@ -28,7 +28,6 @@ class Auth extends QtMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl index a26b27fb..22a27dc3 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl @@ -44,13 +44,12 @@ abstract class BaseMiddleware extends QtMiddleware /** * @param Request $request - * @param Response $response * @return Response|null */ - protected function validateRequest(Request $request, Response $response): ?Response + protected function validateRequest(Request $request): ?Response { if (!$this->validator->isValid($request->all())) { - return $this->respondWithError($request, $response, $this->validator->getErrors()); + return $this->respondWithError($request, $this->validator->getErrors()); } return null; @@ -68,13 +67,12 @@ abstract class BaseMiddleware extends QtMiddleware /** * Handles error response logic. * @param Request $request - * @param Response $response * @param mixed $message * @return Response */ - protected function respondWithError(Request $request, Response $response, $message): Response + protected function respondWithError(Request $request, $message): Response { // default no-op: subclasses override if needed - return $response; + return response(); } } diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl index 3818da5c..748e8641 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl @@ -28,13 +28,11 @@ class Comment extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next */ public function apply(Request $request, Closure $next): Response { - $response = response(); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } @@ -58,9 +56,7 @@ class Comment extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError( - Request $request, - Response $response, + protected function respondWithError(Request $request, $message ): Response { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl index bdcdc58b..1f330851 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl @@ -29,18 +29,16 @@ class CommentOwner extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $uuid = (string)route_param('uuid'); $request->set('uuid', $uuid); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl index 6e426c36..4ff8f8ab 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl @@ -43,19 +43,17 @@ class Editor extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); if (!in_array(auth()->user()->role, self::ROLES)) { return redirect(base_url(true) . '/' . current_lang()); } if ($request->isMethod('post') || $request->isMethod('put')) { - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } } @@ -94,7 +92,7 @@ class Editor extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError(Request $request, Response $response, $message): Response + protected function respondWithError(Request $request, $message): Response { $data = $request->all(); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl index f626cd97..db512a98 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl @@ -30,15 +30,13 @@ class Forget extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); if ($request->isMethod('post')) { - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } } @@ -64,9 +62,7 @@ class Forget extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError( - Request $request, - Response $response, + protected function respondWithError(Request $request, $message ): Response { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl index 565312b2..ab467763 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl @@ -28,7 +28,6 @@ class Guest extends QtMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl index 3470c8e6..1a6c753e 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl @@ -31,14 +31,12 @@ class Password extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next */ public function apply(Request $request, Closure $next): Response { - $response = response(); if ($request->isMethod('post')) { - $this->validateRequest($request, $response); + $this->validateRequest($request); } return $next($request); @@ -70,7 +68,7 @@ class Password extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError(Request $request, Response $response, $message) + protected function respondWithError(Request $request, $message) { session()->setFlash('error', $message); redirectWith(base_url(true) . '/' . current_lang() . '/account-settings#account_password', $request->all()); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl index e16b75ed..f51421d9 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl @@ -31,18 +31,16 @@ class PostOwner extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $uuid = (string)route_param('uuid'); $request->set('uuid', $uuid); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } @@ -67,9 +65,9 @@ class PostOwner extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError(Request $request, Response $response, $message = null): Response + protected function respondWithError(Request $request, $message = null): Response { - return $response->html(partial('errors/404'), StatusCode::NOT_FOUND); + return response()->html(partial('errors/404'), StatusCode::NOT_FOUND); } /** diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl index a71b8350..780fe499 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl @@ -29,18 +29,16 @@ class Resend extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $code = (string) route_param('code'); $request->set('code', $code); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } @@ -62,9 +60,7 @@ class Resend extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError( - Request $request, - Response $response, + protected function respondWithError(Request $request, $message, ): Response { session()->setFlash('error', $message); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl index 690f4a86..fcf8f2cf 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl @@ -30,18 +30,16 @@ class Reset extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $token = (string) route_param('token'); $request->set('token', $token); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } @@ -80,10 +78,10 @@ class Reset extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError(Request $request, Response $response, $message): Response + protected function respondWithError(Request $request, $message): Response { if ($request->isMethod('get') && isset($message['token'])) { - return $response->html(partial('errors/404'), StatusCode::NOT_FOUND); + return response()->html(partial('errors/404'), StatusCode::NOT_FOUND); } session()->setFlash('error', $message); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl index 54d1aee2..36075785 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl @@ -29,13 +29,11 @@ class Signup extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); if ($request->isMethod('post')) { $captchaName = captcha()->getName(); @@ -44,7 +42,7 @@ class Signup extends BaseMiddleware $request->delete($captchaName . '-response'); } - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } @@ -85,7 +83,7 @@ class Signup extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError(Request $request, Response $response, $message): Response + protected function respondWithError(Request $request, $message): Response { session()->setFlash('error', $message); return redirectWith(base_url(true) . '/' . current_lang() . '/signup', $request->all()); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl index 07bf2f1c..443476ed 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl @@ -29,14 +29,12 @@ class Update extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next */ public function apply(Request $request, Closure $next): Response { - $response = response(); if ($request->isMethod('post')) { - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } } @@ -62,9 +60,7 @@ class Update extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError( - Request $request, - Response $response, + protected function respondWithError(Request $request, $message ): Response { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl index 276956be..8eaca22b 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl @@ -30,18 +30,16 @@ class Verify extends BaseMiddleware /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $code = (string) route_param('code'); $request->set('code', $code); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } @@ -67,10 +65,10 @@ class Verify extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError(Request $request, Response $response, $message): Response + protected function respondWithError(Request $request, $message): Response { if ($request->isMethod('get') && isset($message['code'])) { - return $response->html(partial('errors/404'), StatusCode::NOT_FOUND); + return response()->html(partial('errors/404'), StatusCode::NOT_FOUND); } session()->setFlash('error', $message); diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl index 0b3a2388..d0d1361a 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl @@ -43,12 +43,11 @@ abstract class BaseMiddleware extends QtMiddleware /** * @param Request $request - * @param Response $response */ - protected function validateRequest(Request $request, Response $response) + protected function validateRequest(Request $request) { if (!$this->validator->isValid($request->all())) { - $this->respondWithError($request, $response, $this->validator->getErrors()); + $this->respondWithError($request, $this->validator->getErrors()); } } @@ -64,10 +63,9 @@ abstract class BaseMiddleware extends QtMiddleware /** * Handles error response logic. * @param Request $request - * @param Response $response * @param mixed $message */ - protected function respondWithError(Request $request, Response $response, $message) + protected function respondWithError(Request $request, $message) { // default no-op: subclasses override if needed } diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl index 767813eb..98bfe3fa 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl @@ -28,17 +28,15 @@ class BasicAuth extends QtMiddleware { /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); $userCredentials = $request->getBasicAuthCredentials(); if (!$userCredentials || !$this->isValidCredentials($userCredentials)) { - return $this->unauthorizedResponse($response); + return $this->unauthorizedResponse(); } return $next($request); @@ -61,11 +59,11 @@ class BasicAuth extends QtMiddleware } /** - * @param Response $response * @return Response */ - private function unauthorizedResponse(Response $response): Response + private function unauthorizedResponse(): Response { + $response = response(); $response->setHeader('WWW-Authenticate', 'Basic realm="Quantum Toolkit"'); return $response->html(partial('errors' . DS . '401'), 401); } diff --git a/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl index b6b89e71..a7768c26 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl @@ -29,14 +29,12 @@ class CreateTable extends BaseMiddleware { /** * @param Request $request - * @param Response $response * @param Closure $next * @return Response */ public function apply(Request $request, Closure $next): Response { - $response = response(); - if ($errorResponse = $this->validateRequest($request, $response)) { + if ($errorResponse = $this->validateRequest($request)) { return $errorResponse; } @@ -68,7 +66,7 @@ class CreateTable extends BaseMiddleware /** * @inheritDoc */ - protected function respondWithError(Request $request, Response $response, $message): Response + protected function respondWithError(Request $request, $message): Response { session()->setFlash('error', $message); return redirect(get_referrer() ?? base_url()); From b6e8ba0b09bafd09f039989b3164729a5a040f95 Mon Sep 17 00:00:00 2001 From: Arman <407448+armanist@users.noreply.github.com> Date: Fri, 1 May 2026 22:38:12 +0400 Subject: [PATCH 3/8] [#496] Clean template docblocks and inline redundant response locals --- .../src/Controllers/MainController.php.tpl | 1 - .../src/Controllers/MainController.php.tpl | 2 -- .../src/Controllers/AccountController.php.tpl | 7 ----- .../src/Controllers/AuthController.php.tpl | 18 +---------- .../src/Controllers/BaseController.php.tpl | 1 - .../src/Controllers/CommentController.php.tpl | 9 ------ .../OpenApi/OpenApiAuthController.php.tpl | 10 ++----- .../OpenApi/OpenApiPostController.php.tpl | 13 +------- .../src/Controllers/PostController.php.tpl | 6 ---- .../PostManagementController.php.tpl | 26 +++------------- .../DemoApi/src/Middlewares/Activate.php.tpl | 10 ++----- .../DemoApi/src/Middlewares/Auth.php.tpl | 10 ++----- .../src/Middlewares/BaseMiddleware.php.tpl | 15 ++-------- .../DemoApi/src/Middlewares/Comment.php.tpl | 9 ++---- .../src/Middlewares/CommentOwner.php.tpl | 8 +---- .../DemoApi/src/Middlewares/Editor.php.tpl | 9 ++---- .../DemoApi/src/Middlewares/Forget.php.tpl | 11 ++----- .../DemoApi/src/Middlewares/Password.php.tpl | 10 ++----- .../DemoApi/src/Middlewares/PostOwner.php.tpl | 10 ++----- .../DemoApi/src/Middlewares/Resend.php.tpl | 11 ++----- .../DemoApi/src/Middlewares/Reset.php.tpl | 10 ++----- .../DemoApi/src/Middlewares/Signout.php.tpl | 10 ++----- .../DemoApi/src/Middlewares/Signup.php.tpl | 11 ++----- .../DemoApi/src/Middlewares/Update.php.tpl | 10 ++----- .../DemoApi/src/Middlewares/Verify.php.tpl | 11 ++----- .../src/Controllers/AccountController.php.tpl | 6 ---- .../src/Controllers/AuthController.php.tpl | 30 ++++--------------- .../src/Controllers/BaseController.php.tpl | 6 +--- .../src/Controllers/CommentController.php.tpl | 20 +------------ .../src/Controllers/PostController.php.tpl | 8 ----- .../PostManagementController.php.tpl | 22 -------------- .../DemoWeb/src/Middlewares/Activate.php.tpl | 8 +---- .../DemoWeb/src/Middlewares/Auth.php.tpl | 10 ++----- .../src/Middlewares/BaseMiddleware.php.tpl | 14 ++------- .../DemoWeb/src/Middlewares/Comment.php.tpl | 7 +---- .../src/Middlewares/CommentOwner.php.tpl | 8 +---- .../DemoWeb/src/Middlewares/Editor.php.tpl | 9 ++---- .../DemoWeb/src/Middlewares/Forget.php.tpl | 12 ++------ .../DemoWeb/src/Middlewares/Guest.php.tpl | 10 ++----- .../DemoWeb/src/Middlewares/Password.php.tpl | 8 +---- .../DemoWeb/src/Middlewares/PostOwner.php.tpl | 9 +----- .../DemoWeb/src/Middlewares/Resend.php.tpl | 11 ++----- .../DemoWeb/src/Middlewares/Reset.php.tpl | 10 ++----- .../DemoWeb/src/Middlewares/Signup.php.tpl | 10 ++----- .../DemoWeb/src/Middlewares/Update.php.tpl | 10 ++----- .../DemoWeb/src/Middlewares/Verify.php.tpl | 8 +---- .../src/Controllers/BaseController.php.tpl | 6 ---- .../Controllers/DashboardController.php.tpl | 9 ------ .../Controllers/DatabaseController.php.tpl | 19 ------------ .../src/Controllers/EmailsController.php.tpl | 17 +---------- .../src/Controllers/LogsController.php.tpl | 11 ------- .../src/Middlewares/BaseMiddleware.php.tpl | 12 +------- .../Toolkit/src/Middlewares/BasicAuth.php.tpl | 14 +-------- .../src/Middlewares/CreateTable.php.tpl | 7 +---- 54 files changed, 72 insertions(+), 507 deletions(-) diff --git a/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl b/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl index 6d401b9d..ca2623e0 100644 --- a/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl +++ b/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl @@ -34,7 +34,6 @@ class MainController /** * CSRF verification - * @var bool */ public bool $csrfVerification = false; diff --git a/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl b/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl index 09754b05..9b39a2ae 100644 --- a/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl +++ b/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl @@ -32,7 +32,6 @@ class MainController /** * Works before an action - * @param ViewFactory $view */ public function __before(ViewFactory $view) { @@ -44,7 +43,6 @@ class MainController /** * Action - display home page - * @param ViewFactory $view */ public function index(ViewFactory $view): Response { diff --git a/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl index 4f971f59..8cbae35f 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl @@ -28,14 +28,9 @@ class AccountController extends BaseController { /** * Auth service - * @var AuthService */ public AuthService $authService; - /** - * Works before an action - */ - public function __before() { $this->authService = service(AuthService::class); @@ -43,7 +38,6 @@ class AccountController extends BaseController /** * Action - update user info - * @param Request $request */ public function update(Request $request): Response { @@ -72,7 +66,6 @@ class AccountController extends BaseController /** * Action - update password - * @param Request $request */ public function updatePassword(Request $request): Response { diff --git a/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl index b2916528..29f26672 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl @@ -9,7 +9,7 @@ * @author Arman Ag. * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Controllers; @@ -27,11 +27,8 @@ use Quantum\Http\Request; */ class AuthController extends BaseController { - /** * Action - sign in - * @param Request $request - * @return Response */ public function signin(Request $request): Response { @@ -56,7 +53,6 @@ class AuthController extends BaseController /** * Action - me - * @return Response */ public function me(): Response { @@ -72,7 +68,6 @@ class AuthController extends BaseController /** * Action - sign out - * @return Response */ public function signout(): Response { @@ -90,8 +85,6 @@ class AuthController extends BaseController /** * Action - sign up - * @param Request $request - * @return Response */ public function signup(Request $request): Response { @@ -107,8 +100,6 @@ class AuthController extends BaseController /** * Action - activate - * @param Request $request - * @return Response */ public function activate(Request $request): Response { @@ -122,8 +113,6 @@ class AuthController extends BaseController /** * Action - forget - * @param Request $request - * @return Response */ public function forget(Request $request): Response { @@ -137,8 +126,6 @@ class AuthController extends BaseController /** * Action - reset - * @param Request $request - * @return Response */ public function reset(Request $request): Response { @@ -151,8 +138,6 @@ class AuthController extends BaseController /** * Action - Verify OTP - * @param Request $request - * @return Response */ public function verify(Request $request): Response { @@ -172,7 +157,6 @@ class AuthController extends BaseController /** * Action - Resend OTP - * @return Response */ public function resend(): Response { diff --git a/src/Module/Templates/DemoApi/src/Controllers/BaseController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/BaseController.php.tpl index eea9bb3a..3fc59dbb 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/BaseController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/BaseController.php.tpl @@ -33,7 +33,6 @@ abstract class BaseController /** * CSRF verification - * @var bool */ public bool $csrfVerification = false; } diff --git a/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl index 3190d784..631209ad 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl @@ -25,10 +25,6 @@ use Quantum\Http\Request; */ class CommentController extends BaseController { - - /** - * @var CommentService - */ public CommentService $commentService; public function __before() @@ -38,9 +34,6 @@ class CommentController extends BaseController /** * Action - create comment - * @param Request $request - * @param string|null $lang - * @param string $uuid */ public function create(Request $request, ?string $lang, string $uuid): Response { @@ -57,8 +50,6 @@ class CommentController extends BaseController /** * Action - delete comment - * @param string|null $lang - * @param string $uuid */ public function delete(?string $lang, string $uuid): Response { diff --git a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl index 045c12d8..7b1dab2d 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Controllers\OpenApi; @@ -63,7 +63,6 @@ abstract class OpenApiAuthController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Request $request */ abstract public function signin(Request $request); @@ -182,7 +181,6 @@ abstract class OpenApiAuthController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Request $request */ abstract public function signup(Request $request); @@ -218,7 +216,6 @@ abstract class OpenApiAuthController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Request $request */ abstract public function activate(Request $request); @@ -257,7 +254,6 @@ abstract class OpenApiAuthController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Request $request */ abstract public function forget(Request $request); @@ -309,7 +305,6 @@ abstract class OpenApiAuthController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Request $request */ abstract public function reset(Request $request); @@ -348,7 +343,6 @@ abstract class OpenApiAuthController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Request $request */ abstract public function verify(Request $request); diff --git a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl index eed56864..e963f276 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl @@ -9,7 +9,7 @@ * @author Arman Ag. * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Controllers\OpenApi; @@ -43,7 +43,6 @@ abstract class OpenApiPostController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Request $request */ abstract public function posts(Request $request); @@ -79,8 +78,6 @@ abstract class OpenApiPostController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param string|null $lang - * @param string $postId */ abstract public function post(?string $lang, string $postId); @@ -164,7 +161,6 @@ abstract class OpenApiPostController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Request $request */ abstract public function create(Request $request); @@ -228,9 +224,6 @@ abstract class OpenApiPostController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param Request $request - * @param string|null $lang - * @param string $postId */ abstract public function amend(Request $request, ?string $lang, string $postId); @@ -273,8 +266,6 @@ abstract class OpenApiPostController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param string|null $lang - * @param string $postId */ abstract public function delete(?string $lang, string $postId); @@ -317,8 +308,6 @@ abstract class OpenApiPostController extends OpenApiController * description="Internal Server Error" * ) * ) - * @param string|null $lang - * @param string $postId */ abstract public function deleteImage(?string $lang, string $postId); diff --git a/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl index 347ec9dd..dc79eee7 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl @@ -41,7 +41,6 @@ class PostController extends BaseController /** * Post service - * @var PostService */ public PostService $postService; @@ -52,8 +51,6 @@ class PostController extends BaseController /** * Action - get posts list - * @param Request $request - * @return Response */ public function posts(Request $request): Response { @@ -77,9 +74,6 @@ class PostController extends BaseController /** * Action - get single post - * @param string|null $lang - * @param string $postUuid - * @return Response */ public function post(?string $lang, string $postUuid): Response { diff --git a/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl index 32671533..40cba725 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl @@ -31,7 +31,6 @@ class PostManagementController extends BaseController /** * Post service - * @var PostService */ public PostService $postService; @@ -42,7 +41,6 @@ class PostManagementController extends BaseController /** * Action - get my posts - * @return Response */ public function myPosts(): Response { @@ -56,12 +54,9 @@ class PostManagementController extends BaseController /** * Action - create post - * @param Request $request - * @return Response */ public function create(Request $request): Response { - $response = response(); $imageName = ''; if ($request->hasFile('image')) { @@ -76,7 +71,7 @@ class PostManagementController extends BaseController $post = $this->postService->addPost($postDto); - return $response->json([ + return response()->json([ 'status' => 'success', 'message' => t('common.created_successfully'), 'data' => current($this->postService->transformData([$post])) @@ -85,14 +80,9 @@ class PostManagementController extends BaseController /** * Action - amend post - * @param Request $request - * @param string|null $lang - * @param string $postUuid - * @return Response */ public function amend(Request $request, ?string $lang, string $postUuid): Response { - $response = response(); $post = $this->postService->getPost($postUuid); $imageName = null; @@ -113,7 +103,7 @@ class PostManagementController extends BaseController $post = $this->postService->updatePost($postUuid, $postDto); - return $response->json([ + return response()->json([ 'status' => 'success', 'message' => t('common.updated_successfully'), 'data' => current($this->postService->transformData([$post])) @@ -122,13 +112,9 @@ class PostManagementController extends BaseController /** * Action - delete post - * @param string|null $lang - * @param string $postUuid - * @return Response */ public function delete(?string $lang, string $postUuid): Response { - $response = response(); $post = $this->postService->getPost($postUuid); if ($post->image) { @@ -137,7 +123,7 @@ class PostManagementController extends BaseController $this->postService->deletePost($postUuid); - return $response->json([ + return response()->json([ 'status' => 'success', 'message' => t('common.deleted_successfully') ]); @@ -145,13 +131,9 @@ class PostManagementController extends BaseController /** * Action - delete image of the post - * @param string|null $lang - * @param string $postUuid - * @return Response */ public function deleteImage(?string $lang, string $postUuid): Response { - $response = response(); $post = $this->postService->getPost($postUuid); if ($post->image) { @@ -167,7 +149,7 @@ class PostManagementController extends BaseController $this->postService->updatePost($postUuid, $postDto); - return $response->json([ + return response()->json([ 'status' => 'success', 'message' => t('common.deleted_successfully') ]); diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl index 71ae92ef..d827a6fd 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,12 +26,6 @@ use Closure; */ class Activate extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $token = (string)route_param('token'); diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl index 0291d528..06955d47 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,12 +25,6 @@ use Closure; */ class Auth extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if (!auth()->check()) { diff --git a/src/Module/Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl index 10d89e52..365abed8 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -27,15 +27,10 @@ use Closure; */ abstract class BaseMiddleware extends QtMiddleware { - - /** - * @var Validator - */ protected $validator; /** * BaseMiddleware constructor. - * @param Request $request */ public function __construct(Request $request) { @@ -46,7 +41,6 @@ abstract class BaseMiddleware extends QtMiddleware /** * Define validation rules specific to middleware. - * @param Request $request */ protected function defineValidationRules(Request $request) { @@ -55,7 +49,6 @@ abstract class BaseMiddleware extends QtMiddleware /** * Validate the request and respond with error if invalid. - * @param Request $request * @return Response|null */ protected function validateRequest(Request $request): ?Response @@ -69,10 +62,6 @@ abstract class BaseMiddleware extends QtMiddleware /** * Handles error response logic. - * @param Request $request - * @param mixed $message - * @param int $status - * @return Response */ protected function respondWithError(Request $request, $message, diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl index 2cd0f670..c377c0ea 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,11 +25,6 @@ use Closure; */ class Comment extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - */ public function apply(Request $request, Closure $next): Response { if ($errorResponse = $this->validateRequest($request)) { diff --git a/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl index 1f330851..f3121cf4 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl @@ -9,7 +9,7 @@ * @author Arman Ag. * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,12 +26,6 @@ use Closure; */ class CommentOwner extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $uuid = (string)route_param('uuid'); diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl index 1e8f8cbd..8e25b4f0 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -42,11 +42,6 @@ class Editor extends BaseMiddleware */ private const ALLOWED_IMAGE_EXTENSIONS = ['jpeg', 'jpg', 'png']; - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if (!in_array(auth()->user()->role, self::ROLES)) { diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl index cf60e1ff..8608f987 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,13 +26,6 @@ use Closure; */ class Forget extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if ($request->isMethod('post')) { diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl index 33658d90..f472d7e3 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -27,11 +27,6 @@ use Closure; */ class Password extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - */ public function apply(Request $request, Closure $next): Response { if ($request->isMethod('post')) { @@ -68,7 +63,6 @@ class Password extends BaseMiddleware /** * Registers custom validation rules - * @param Request $request */ private function registerCustomRules(Request $request) { diff --git a/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl index 6841bc94..bb7415cd 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,12 +26,6 @@ use Closure; */ class PostOwner extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $uuid = (string)route_param('uuid'); diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl index 1006507b..89f3d82c 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,13 +25,6 @@ use Closure; */ class Resend extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $code = (string) route_param('code'); diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl index 02500bd1..b8e09a58 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,12 +26,6 @@ use Closure; */ class Reset extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $token = (string) route_param('token'); diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl index 19e7b8b3..7a8ff538 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -24,12 +24,6 @@ use Closure; */ class Signout extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if (!$request->hasHeader('refresh_token')) { diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl index 408d6e05..02935a52 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,13 +26,6 @@ use Closure; */ class Signup extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if ($errorResponse = $this->validateRequest($request)) { diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl index 039f7945..0503fbea 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,12 +25,6 @@ use Closure; */ class Update extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - */ public function apply(Request $request, Closure $next): Response { if ($request->isMethod('post')) { diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl index c5e4db2b..0db3f19f 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,13 +26,6 @@ use Closure; class Verify extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if ($request->isMethod('post')) { diff --git a/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl index 19ab8ddf..b21d8044 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl @@ -32,7 +32,6 @@ class AccountController extends BaseController /** * Account service - * @var AuthService */ public AuthService $authService; @@ -44,7 +43,6 @@ class AccountController extends BaseController /** * Action - show user info - * @return Response */ public function form(): Response { @@ -57,8 +55,6 @@ class AccountController extends BaseController /** * Action - update user info - * @param Request $request - * @return Response */ public function update(Request $request): Response { @@ -77,8 +73,6 @@ class AccountController extends BaseController /** * Action - update password - * @param Request $request - * @return Response */ public function updatePassword(Request $request): Response { diff --git a/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl index ccd217c0..59e3e7e1 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl @@ -26,7 +26,6 @@ use Quantum\Http\Request; */ class AuthController extends BaseController { - /** * Main layout */ @@ -59,12 +58,9 @@ class AuthController extends BaseController /** * Action - sign in - * @param Request $request - * @return Response */ public function signin(Request $request): Response { - $response = response(); if ($request->isMethod('post')) { try { $code = auth()->signin($request->get('email'), $request->get('password'), !!$request->get('remember')); @@ -83,13 +79,12 @@ class AuthController extends BaseController 'title' => t('common.signin') . ' | ' . config()->get('app.name'), ]); - return $response->html($this->view->render(self::VIEW_SIGNIN)); + return response()->html($this->view->render(self::VIEW_SIGNIN)); } } /** * Action - sign out - * @return Response */ public function signout(): Response { @@ -99,12 +94,9 @@ class AuthController extends BaseController /** * Action - sign up - * @param Request $request - * @return Response */ public function signup(Request $request): Response { - $response = response(); if ($request->isMethod('post')) { $userDto = UserDTO::fromRequest($request, Role::EDITOR, uuid_ordered()); @@ -118,14 +110,12 @@ class AuthController extends BaseController 'title' => t('common.signup') . ' | ' . config()->get('app.name'), ]); - return $response->html($this->view->render(self::VIEW_SIGNUP)); + return response()->html($this->view->render(self::VIEW_SIGNUP)); } } /** * Action - activate - * @param Request $request - * @return Response */ public function activate(Request $request): Response { @@ -135,12 +125,9 @@ class AuthController extends BaseController /** * Action - forget - * @param Request $request - * @return Response */ public function forget(Request $request): Response { - $response = response(); if ($request->isMethod('post')) { auth()->forget($request->get('email')); session()->setFlash('success', t('common.check_email')); @@ -150,18 +137,15 @@ class AuthController extends BaseController 'title' => t('common.forget_password') . ' | ' . config()->get('app.name'), ]); - return $response->html($this->view->render(self::VIEW_FORGET)); + return response()->html($this->view->render(self::VIEW_FORGET)); } } /** * Action - reset - * @param Request $request - * @return Response */ public function reset(Request $request): Response { - $response = response(); if ($request->isMethod('post')) { auth()->reset($request->get('reset_token'), $request->get('password')); return redirect(base_url(true) . '/' . current_lang() . '/signin'); @@ -171,18 +155,15 @@ class AuthController extends BaseController 'reset_token' => $request->get('reset_token') ]); - return $response->html($this->view->render(self::VIEW_RESET)); + return response()->html($this->view->render(self::VIEW_RESET)); } } /** * Action - Verify OTP - * @param Request $request - * @return Response */ public function verify(Request $request): Response { - $response = response(); if ($request->isMethod('post')) { try { auth()->verifyOtp((int)$request->get('otp'), $request->get('code')); @@ -197,13 +178,12 @@ class AuthController extends BaseController 'code' => route_param('code') ]); - return $response->html($this->view->render(self::VIEW_VERIFY)); + return response()->html($this->view->render(self::VIEW_VERIFY)); } } /** * Action - Resend OTP - * @return Response */ public function resend(): Response { diff --git a/src/Module/Templates/DemoWeb/src/Controllers/BaseController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/BaseController.php.tpl index 85bd60b6..2ab031df 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/BaseController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/BaseController.php.tpl @@ -1,4 +1,4 @@ -commentService = service(CommentService::class); @@ -45,10 +34,6 @@ class CommentController extends BaseController /** * Action - create comment - * @param Request $request - * @param string|null $lang - * @param string $uuid - * @return Response */ public function create(Request $request, ?string $lang, string $uuid): Response { @@ -62,9 +47,6 @@ class CommentController extends BaseController /** * Action - delete comment - * @param string|null $lang - * @param string $uuid - * @return Response */ public function delete(?string $lang, string $uuid): Response { diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl index 0667735e..660c3ffc 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl @@ -27,7 +27,6 @@ use Quantum\Http\Request; */ class PostController extends BaseController { - /** * Posts per page */ @@ -45,7 +44,6 @@ class PostController extends BaseController /** * Post service - * @var PostService */ public PostService $postService; @@ -57,8 +55,6 @@ class PostController extends BaseController /** * Action - get posts list - * @param Request $request - * @return Response */ public function posts(Request $request): Response { @@ -80,10 +76,6 @@ class PostController extends BaseController /** * Action - get single post - * @param Request $request - * @param string|null $lang - * @param string $postUuid - * @return Response */ public function post(Request $request, ?string $lang, string $postUuid): Response { diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl index 3d884cfc..b51bbfc0 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl @@ -25,7 +25,6 @@ use Quantum\Http\Request; */ class PostManagementController extends BaseController { - /** * Main layout */ @@ -33,7 +32,6 @@ class PostManagementController extends BaseController /** * Post service - * @var PostService */ public PostService $postService; @@ -45,8 +43,6 @@ class PostManagementController extends BaseController /** * Action - get my posts - * @param Request $request - * @return Response */ public function myPosts(Request $request): Response { @@ -62,8 +58,6 @@ class PostManagementController extends BaseController /** * Action - display form for creating a post - * @param Request $request - * @return Response */ public function createFrom(Request $request): Response { @@ -79,8 +73,6 @@ class PostManagementController extends BaseController /** * Action - create post - * @param Request $request - * @return Response */ public function create(Request $request): Response { @@ -103,10 +95,6 @@ class PostManagementController extends BaseController /** * Action - display form for amend the post - * @param Request $request - * @param string|null $lang - * @param string $postUuid - * @return Response */ public function amendForm(Request $request, ?string $lang, string $postUuid): Response { @@ -125,10 +113,6 @@ class PostManagementController extends BaseController /** * Action - amend post - * @param Request $request - * @param string|null $lang - * @param string $postUuid - * @return Response */ public function amend(Request $request, ?string $lang, string $postUuid): Response { @@ -157,9 +141,6 @@ class PostManagementController extends BaseController /** * Action - delete post - * @param string|null $lang - * @param string $postUuid - * @return Response */ public function delete(?string $lang, string $postUuid): Response { @@ -176,9 +157,6 @@ class PostManagementController extends BaseController /** * Action - delete image of the post - * @param string|null $lang - * @param string $postUuid - * @return Response */ public function deleteImage(?string $lang, string $postUuid): Response { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl index 3fa17dde..5b49131e 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl @@ -9,7 +9,7 @@ * @author Arman Ag. * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -27,12 +27,6 @@ use Closure; */ class Activate extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $token = (string)route_param('token'); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl index f26ca9cc..66f85ff6 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,12 +25,6 @@ use Closure; */ class Auth extends QtMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if (!auth()->check()) { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl index 22a27dc3..1a715176 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,15 +25,10 @@ use Quantum\Http\Request; */ abstract class BaseMiddleware extends QtMiddleware { - - /** - * @var Validator - */ protected $validator; /** * Initialize Validator and define rules. - * @param Request $request */ public function __construct(Request $request) { @@ -43,7 +38,6 @@ abstract class BaseMiddleware extends QtMiddleware } /** - * @param Request $request * @return Response|null */ protected function validateRequest(Request $request): ?Response @@ -57,7 +51,6 @@ abstract class BaseMiddleware extends QtMiddleware /** * Define validation rules specific to middleware. - * @param Request $request */ protected function defineValidationRules(Request $request) { @@ -66,9 +59,6 @@ abstract class BaseMiddleware extends QtMiddleware /** * Handles error response logic. - * @param Request $request - * @param mixed $message - * @return Response */ protected function respondWithError(Request $request, $message): Response { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl index 748e8641..703bba01 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl @@ -9,7 +9,7 @@ * @author Arman Ag. * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,11 +25,6 @@ use Closure; */ class Comment extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - */ public function apply(Request $request, Closure $next): Response { if ($errorResponse = $this->validateRequest($request)) { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl index 1f330851..f3121cf4 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl @@ -9,7 +9,7 @@ * @author Arman Ag. * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,12 +26,6 @@ use Closure; */ class CommentOwner extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $uuid = (string)route_param('uuid'); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl index 4ff8f8ab..372b4296 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -41,11 +41,6 @@ class Editor extends BaseMiddleware */ private const ALLOWED_IMAGE_EXTENSIONS = ['jpeg', 'jpg', 'png']; - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if (!in_array(auth()->user()->role, self::ROLES)) { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl index db512a98..0516e235 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,13 +26,6 @@ use Closure; */ class Forget extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if ($request->isMethod('post')) { @@ -46,7 +39,6 @@ class Forget extends BaseMiddleware /** * Define validation rules - * @param Request $request */ protected function defineValidationRules(Request $request) { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl index ab467763..9aef216a 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,12 +25,6 @@ use Closure; */ class Guest extends QtMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if (auth()->check()) { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl index 1a6c753e..38a9ea48 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl @@ -9,7 +9,7 @@ * @author Arman Ag. * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -27,12 +27,6 @@ use Closure; */ class Password extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - */ public function apply(Request $request, Closure $next): Response { if ($request->isMethod('post')) { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl index f51421d9..5347a80c 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl @@ -9,7 +9,7 @@ * @author Arman Ag. * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.9 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -27,13 +27,6 @@ use Closure; */ class PostOwner extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $uuid = (string)route_param('uuid'); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl index 780fe499..2df6c5db 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,13 +25,6 @@ use Closure; */ class Resend extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $code = (string) route_param('code'); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl index fcf8f2cf..dfe4a002 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -27,12 +27,6 @@ use Closure; */ class Reset extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $token = (string) route_param('token'); diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl index 36075785..0186006f 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -26,12 +26,6 @@ use Closure; */ class Signup extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { if ($request->isMethod('post')) { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl index 443476ed..68611a14 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl @@ -1,4 +1,4 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -25,12 +25,6 @@ use Closure; */ class Update extends BaseMiddleware { - - - /** - * @param Request $request - * @param Closure $next - */ public function apply(Request $request, Closure $next): Response { if ($request->isMethod('post')) { diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl index 8eaca22b..0a0dd16c 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl @@ -9,7 +9,7 @@ * @author Arman Ag. * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) * @link http://quantum.softberg.org/ - * @since 2.9.8 + * @since 3.0.0 */ namespace {{MODULE_NAMESPACE}}\Middlewares; @@ -27,12 +27,6 @@ use Closure; */ class Verify extends BaseMiddleware { - - /** - * @param Request $request - * @param Closure $next - * @return Response - */ public function apply(Request $request, Closure $next): Response { $code = (string) route_param('code'); diff --git a/src/Module/Templates/Toolkit/src/Controllers/BaseController.php.tpl b/src/Module/Templates/Toolkit/src/Controllers/BaseController.php.tpl index 953eb26c..3658c5b8 100644 --- a/src/Module/Templates/Toolkit/src/Controllers/BaseController.php.tpl +++ b/src/Module/Templates/Toolkit/src/Controllers/BaseController.php.tpl @@ -39,14 +39,8 @@ class BaseController */ protected const CURRENT_PAGE = 1; - /** - * @var View - */ protected View $view; - /** - * Works before an action - */ public function __before() { $this->view = ViewFactory::get(); diff --git a/src/Module/Templates/Toolkit/src/Controllers/DashboardController.php.tpl b/src/Module/Templates/Toolkit/src/Controllers/DashboardController.php.tpl index bde95939..bf87f55e 100644 --- a/src/Module/Templates/Toolkit/src/Controllers/DashboardController.php.tpl +++ b/src/Module/Templates/Toolkit/src/Controllers/DashboardController.php.tpl @@ -28,14 +28,8 @@ use ReflectionException; */ class DashboardController extends BaseController { - /** - * @var DashboardService - */ public DashboardService $dashboardService; - /** - * Works before an action - */ public function __before() { $this->dashboardService = service(DashboardService::class); @@ -43,9 +37,6 @@ class DashboardController extends BaseController parent::__before(); } - /** - * @param Request $request - */ public function index(Request $request): Response { $this->view->setParams([ diff --git a/src/Module/Templates/Toolkit/src/Controllers/DatabaseController.php.tpl b/src/Module/Templates/Toolkit/src/Controllers/DatabaseController.php.tpl index ebd71894..6c802cfb 100644 --- a/src/Module/Templates/Toolkit/src/Controllers/DatabaseController.php.tpl +++ b/src/Module/Templates/Toolkit/src/Controllers/DatabaseController.php.tpl @@ -25,9 +25,6 @@ use Quantum\Http\Request; */ class DatabaseController extends BaseController { - /** - * @var DatabaseService - */ private DatabaseService $databaseService; /** @@ -40,9 +37,6 @@ class DatabaseController extends BaseController parent::__before(); } - /** - * @return Response - */ public function list(): Response { $tables = $this->databaseService->getTables(); @@ -56,7 +50,6 @@ class DatabaseController extends BaseController } /** - * @param Request $request * @throws DatabaseException */ public function single(Request $request): Response @@ -80,10 +73,6 @@ class DatabaseController extends BaseController return response()->html($this->view->render('pages/database/table')); } - /** - * @param Request $request - * @return Response - */ public function create(Request $request): Response { $tableName = $request->get('table'); @@ -95,10 +84,6 @@ class DatabaseController extends BaseController return redirect(get_referrer() ?? base_url()); } - /** - * @param Request $request - * @return Response - */ public function update(Request $request): Response { $tableName = $request->get('table'); @@ -110,10 +95,6 @@ class DatabaseController extends BaseController return redirect(base_url(true) . '/database/view?table=' . $tableName); } - /** - * @param Request $request - * @return Response - */ public function delete(Request $request): Response { $tableName = $request->get('tableName'); diff --git a/src/Module/Templates/Toolkit/src/Controllers/EmailsController.php.tpl b/src/Module/Templates/Toolkit/src/Controllers/EmailsController.php.tpl index 22690419..07309253 100644 --- a/src/Module/Templates/Toolkit/src/Controllers/EmailsController.php.tpl +++ b/src/Module/Templates/Toolkit/src/Controllers/EmailsController.php.tpl @@ -1,4 +1,4 @@ -emailService = service(EmailService::class); @@ -43,9 +37,6 @@ class EmailsController extends BaseController parent::__before(); } - /** - * @param Request $request - */ public function list(Request $request): Response { $perPage = $request->get('per_page', self::ITEMS_PER_PAGE); @@ -62,9 +53,6 @@ class EmailsController extends BaseController return response()->html($this->view->render('pages/email/index')); } - /** - * @param string $emailId - */ public function single(string $emailId): Response { $email = $this->emailService->getEmail($emailId); @@ -72,9 +60,6 @@ class EmailsController extends BaseController return response()->html(quoted_printable_decode($email->getParsedBody())); } - /** - * @param string $emailId - */ public function delete(string $emailId): Response { $this->emailService->deleteEmail($emailId); diff --git a/src/Module/Templates/Toolkit/src/Controllers/LogsController.php.tpl b/src/Module/Templates/Toolkit/src/Controllers/LogsController.php.tpl index f95eaf23..0bcf2edf 100644 --- a/src/Module/Templates/Toolkit/src/Controllers/LogsController.php.tpl +++ b/src/Module/Templates/Toolkit/src/Controllers/LogsController.php.tpl @@ -28,14 +28,8 @@ use ReflectionException; */ class LogsController extends BaseController { - /** - * @var LogsService - */ public LogsService $logsService; - /** - * Works before an action - */ public function __before() { $this->logsService = service(LogsService::class); @@ -43,8 +37,6 @@ class LogsController extends BaseController parent::__before(); } - /** - */ public function list(): Response { $filteredLogFiles = $this->logsService->getLogFiles(); @@ -57,9 +49,6 @@ class LogsController extends BaseController return response()->html($this->view->render('pages/logs/index')); } - /** - * @param Request $request - */ public function single(Request $request): Response { $logFile = $request->get('logFile'); diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl index d0d1361a..26cc3282 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl @@ -1,4 +1,4 @@ -defineValidationRules($request); } - /** - * @param Request $request - */ protected function validateRequest(Request $request) { if (!$this->validator->isValid($request->all())) { @@ -53,7 +46,6 @@ abstract class BaseMiddleware extends QtMiddleware /** * Define validation rules specific to middleware. - * @param Request $request */ protected function defineValidationRules(Request $request) { @@ -62,8 +54,6 @@ abstract class BaseMiddleware extends QtMiddleware /** * Handles error response logic. - * @param Request $request - * @param mixed $message */ protected function respondWithError(Request $request, $message) { diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl index 98bfe3fa..9153f5c8 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl @@ -1,4 +1,4 @@ -getBasicAuthCredentials(); @@ -42,10 +37,6 @@ class BasicAuth extends QtMiddleware return $next($request); } - /** - * @param array $credentials - * @return bool - */ private function isValidCredentials(array $credentials): bool { if (!config()->has('basic_auth')) { @@ -58,9 +49,6 @@ class BasicAuth extends QtMiddleware && $credentials['password'] === $configCredentials['password']; } - /** - * @return Response - */ private function unauthorizedResponse(): Response { $response = response(); diff --git a/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl index a7768c26..1b6510c1 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl @@ -1,4 +1,4 @@ -validateRequest($request)) { From d7778de09dbcc03883f9eb6cd05d53773270570b Mon Sep 17 00:00:00 2001 From: Arman <407448+armanist@users.noreply.github.com> Date: Fri, 1 May 2026 22:47:26 +0400 Subject: [PATCH 4/8] [#496] Remove UTF-8 BOM from module template PHP files --- .../src/Controllers/OpenApi/OpenApiAuthController.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl | 2 +- .../Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl | 2 +- src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl | 2 +- .../Templates/DemoWeb/src/Controllers/BaseController.php.tpl | 2 +- .../Templates/DemoWeb/src/Controllers/CommentController.php.tpl | 2 +- src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl | 2 +- .../Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl | 2 +- src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl | 2 +- src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl | 2 +- src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl | 2 +- src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl | 2 +- src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl | 2 +- src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl | 2 +- src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl | 2 +- .../Templates/Toolkit/src/Controllers/EmailsController.php.tpl | 2 +- .../Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl | 2 +- src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl | 2 +- .../Templates/Toolkit/src/Middlewares/CreateTable.php.tpl | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl index 7b1dab2d..e7295440 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl @@ -1,4 +1,4 @@ - Date: Fri, 1 May 2026 22:53:25 +0400 Subject: [PATCH 5/8] [#496] Fix template response regressions and signature spacing --- .../DefaultWeb/src/Controllers/MainController.php.tpl | 2 +- .../DemoApi/src/Controllers/AccountController.php.tpl | 4 ++-- .../DemoApi/src/Controllers/AuthController.php.tpl | 6 +++--- .../DemoApi/src/Controllers/CommentController.php.tpl | 2 +- .../src/Controllers/OpenApi/OpenApiPostController.php.tpl | 2 +- .../DemoApi/src/Controllers/PostController.php.tpl | 2 +- .../src/Controllers/PostManagementController.php.tpl | 2 +- .../DemoWeb/src/Controllers/PostController.php.tpl | 4 ++-- .../src/Controllers/PostManagementController.php.tpl | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl b/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl index 9b39a2ae..372e2866 100644 --- a/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl +++ b/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl @@ -50,6 +50,6 @@ class MainController 'title' => config()->get('app.name'), ]); - return $response->html($view->render('index')); + return response()->html($view->render('index')); } } diff --git a/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl index 8cbae35f..34904b65 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl @@ -57,7 +57,7 @@ class AccountController extends BaseController 'message' => t('common.updated_successfully') ]); } catch (AuthException $e) { - return $response->json([ + return response()->json([ 'status' => self::STATUS_ERROR, 'message' => $e->getMessage() ]); @@ -83,7 +83,7 @@ class AccountController extends BaseController 'message' => t('common.updated_successfully') ]); } catch (AuthException $e) { - return $response->json([ + return response()->json([ 'status' => self::STATUS_ERROR, 'message' => $e->getMessage() ]); diff --git a/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl index 29f26672..624904d3 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl @@ -76,7 +76,7 @@ class AuthController extends BaseController 'status' => self::STATUS_SUCCESS ]); } else { - return $response->json([ + return response()->json([ 'status' => self::STATUS_ERROR, 'message' => t('validation.unauthorizedRequest') ], StatusCode::UNAUTHORIZED); @@ -148,7 +148,7 @@ class AuthController extends BaseController 'status' => self::STATUS_SUCCESS ]); } catch (AuthException $e) { - return $response->json([ + return response()->json([ 'status' => self::STATUS_ERROR, 'message' => $e->getMessage() ], StatusCode::UNAUTHORIZED); @@ -166,7 +166,7 @@ class AuthController extends BaseController 'code' => auth()->resendOtp(route_param('code')) ]); } catch (AuthException $e) { - return $response->json([ + return response()->json([ 'status' => self::STATUS_ERROR, 'message' => $e->getMessage() ], StatusCode::UNAUTHORIZED); diff --git a/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl index 631209ad..2ebaf76b 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/CommentController.php.tpl @@ -35,7 +35,7 @@ class CommentController extends BaseController /** * Action - create comment */ - public function create(Request $request, ?string $lang, string $uuid): Response + public function create(Request $request, ?string $lang, string $uuid): Response { $commentDto = CommentDTO::fromRequest($request, $uuid, auth()->user()->uuid); diff --git a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl index e963f276..bc9a7cde 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl @@ -225,7 +225,7 @@ abstract class OpenApiPostController extends OpenApiController * ) * ) */ - abstract public function amend(Request $request, ?string $lang, string $postId); + abstract public function amend(Request $request, ?string $lang, string $postId); /** * Delete post action diff --git a/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl index dc79eee7..e426fe0c 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl @@ -96,7 +96,7 @@ class PostController extends BaseController $postData['comments'] = $commentsData; - return $response->json([ + return response()->json([ 'status' => 'success', 'data' => $postData, ]); diff --git a/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl index 40cba725..9f3463e7 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl @@ -81,7 +81,7 @@ class PostManagementController extends BaseController /** * Action - amend post */ - public function amend(Request $request, ?string $lang, string $postUuid): Response + public function amend(Request $request, ?string $lang, string $postUuid): Response { $post = $this->postService->getPost($postUuid); diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl index 660c3ffc..4ec6df68 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl @@ -77,7 +77,7 @@ class PostController extends BaseController /** * Action - get single post */ - public function post(Request $request, ?string $lang, string $postUuid): Response + public function post(Request $request, ?string $lang, string $postUuid): Response { $ref = $request->get('ref', 'posts'); @@ -100,6 +100,6 @@ class PostController extends BaseController 'referer' => nav_ref_decode($ref), ]); - return $response->html($this->view->render('post/single')); + return response()->html($this->view->render('post/single')); } } diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl index b51bbfc0..2a9767a3 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl @@ -96,7 +96,7 @@ class PostManagementController extends BaseController /** * Action - display form for amend the post */ - public function amendForm(Request $request, ?string $lang, string $postUuid): Response + public function amendForm(Request $request, ?string $lang, string $postUuid): Response { $ref = $request->get('ref', 'posts'); From 11f8c044e2e705187a28b4b2090e774106c63a2d Mon Sep 17 00:00:00 2001 From: Arman <407448+armanist@users.noreply.github.com> Date: Fri, 1 May 2026 22:58:05 +0400 Subject: [PATCH 6/8] [#496] Fix middleware error-response return propagation --- src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl | 2 +- .../Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl index e291c63c..8e8e24c6 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl @@ -27,7 +27,7 @@ class Signout extends BaseMiddleware public function apply(Request $request, Closure $next): Response { if (!$request->hasHeader('refresh_token')) { - $this->respondWithError($request, + return $this->respondWithError($request, [t('validation.nonExistingRecord', 'token')] ); } diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl index 2a61ca5a..9afe948a 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl @@ -40,7 +40,7 @@ abstract class BaseMiddleware extends QtMiddleware protected function validateRequest(Request $request) { if (!$this->validator->isValid($request->all())) { - $this->respondWithError($request, $this->validator->getErrors()); + return $this->respondWithError($request, $this->validator->getErrors()); } } From 2402dbbdaa6a361d1740277e3481d3f8bc1d8be2 Mon Sep 17 00:00:00 2001 From: Arman <407448+armanist@users.noreply.github.com> Date: Mon, 4 May 2026 12:09:12 +0400 Subject: [PATCH 7/8] [#496] Tighten Toolkit middleware response contract --- .../Toolkit/src/Middlewares/BaseMiddleware.php.tpl | 11 +++++------ .../Toolkit/src/Middlewares/BasicAuth.php.tpl | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl index 9afe948a..c4c671dc 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl @@ -14,8 +14,8 @@ namespace Modules\Toolkit\Middlewares; -use Quantum\Validation\Validator; use Quantum\Middleware\QtMiddleware; +use Quantum\Validation\Validator; use Quantum\Http\Response; use Quantum\Http\Request; @@ -37,11 +37,13 @@ abstract class BaseMiddleware extends QtMiddleware $this->defineValidationRules($request); } - protected function validateRequest(Request $request) + protected function validateRequest(Request $request): ?Response { if (!$this->validator->isValid($request->all())) { return $this->respondWithError($request, $this->validator->getErrors()); } + + return null; } /** @@ -55,8 +57,5 @@ abstract class BaseMiddleware extends QtMiddleware /** * Handles error response logic. */ - protected function respondWithError(Request $request, $message) - { - // default no-op: subclasses override if needed - } + abstract protected function respondWithError(Request $request, $message): Response; } diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl index 07c94749..19e2b8d9 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl @@ -51,8 +51,8 @@ class BasicAuth extends QtMiddleware private function unauthorizedResponse(): Response { - $response = response(); - $response->setHeader('WWW-Authenticate', 'Basic realm="Quantum Toolkit"'); - return $response->html(partial('errors' . DS . '401'), 401); + return response() + ->setHeader('WWW-Authenticate', 'Basic realm="Quantum Toolkit"') + ->html(partial('errors' . DS . '401'), 401); } } From 9b931795e4149767daa16a85d66f6e6ddc63715a Mon Sep 17 00:00:00 2001 From: Arman <407448+armanist@users.noreply.github.com> Date: Mon, 4 May 2026 12:43:27 +0400 Subject: [PATCH 8/8] [#496] Fix missing validateRequest return in DemoWeb Password template --- src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl index 38a9ea48..37d41614 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl @@ -30,7 +30,9 @@ class Password extends BaseMiddleware public function apply(Request $request, Closure $next): Response { if ($request->isMethod('post')) { - $this->validateRequest($request); + if ($errorResponse = $this->validateRequest($request)) { + return $errorResponse; + } } return $next($request);