From 0da68838ded45c9e6ff5346217ad5d16bd389e10 Mon Sep 17 00:00:00 2001
From: Arman <407448+armanist@users.noreply.github.com>
Date: Wed, 13 May 2026 16:40:00 +0400
Subject: [PATCH] [#518] Fix middleware template signature mismatches

---
 CHANGELOG.md                                                  | 1 +
 src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl | 4 ++--
 .../Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl  | 2 +-
 .../Templates/Toolkit/src/Middlewares/CreateTable.php.tpl     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6df212f9..0912dd6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
 - Fixed cURL error message assertions for cross-version compatibility
 - Fixed SleekDB paginator query-state regression where `count()` could clear criteria before paginated data fetch on the same model instance (#514)
 - Standardized `defineValidationRules(Request $request): void` across DemoWeb and DemoApi middleware templates
+- Standardized `defineValidationRules(Request $request): void` in Toolkit middleware templates
 
 ### Added
 - `AppContext` class representing the runtime identity of a single application execution
diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl
index d7267e38..b931e0aa 100644
--- a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl
+++ b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl
@@ -64,10 +64,10 @@ class Password extends BaseMiddleware
     /**
      * @inheritDoc
      */
-    protected function respondWithError(Request $request, $message)
+    protected function respondWithError(Request $request, $message): Response
     {
         session()->setFlash('error', $message);
-        redirectWith(base_url(true) . '/' . current_lang() . '/account-settings#account_password', $request->all());
+        return redirectWith(base_url(true) . '/' . current_lang() . '/account-settings#account_password', $request->all());
     }
 
     /**
diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl
index c970c1f2..9f96d290 100644
--- a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl
+++ b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl
@@ -49,7 +49,7 @@ abstract class BaseMiddleware extends Middleware
     /**
      * Define validation rules specific to middleware.
      */
-    protected function defineValidationRules(Request $request)
+    protected function defineValidationRules(Request $request): void
     {
         // default no-op: subclasses override if needed
     }
diff --git a/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl
index bb65afb7..076fd1c4 100644
--- a/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl
+++ b/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl
@@ -39,7 +39,7 @@ class CreateTable extends BaseMiddleware
     /**
      * @inheritDoc
      */
-    protected function defineValidationRules(Request $request)
+    protected function defineValidationRules(Request $request): void
     {
         $this->registerCustomRules();