Skip to content

Commit c236264

Browse files
authored
Merge pull request #517 from armanist/issue/516-middleware-void-signatures
[#516] Standardize middleware validation rule signatures
2 parents ac34323 + a9b8ea6 commit c236264

20 files changed

Lines changed: 25 additions & 32 deletions

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
- Fixed deprecated `E_STRICT` constant usage in test bootstrap
8181
- Fixed cURL error message assertions for cross-version compatibility
8282
- Fixed SleekDB paginator query-state regression where `count()` could clear criteria before paginated data fetch on the same model instance (#514)
83+
- Standardized `defineValidationRules(Request $request): void` across DemoWeb and DemoApi middleware templates
8384

8485
### Added
8586
- `AppContext` class representing the runtime identity of a single application execution

src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Activate extends BaseMiddleware
4444
/**
4545
* @inheritDoc
4646
*/
47-
protected function defineValidationRules(Request $request)
47+
protected function defineValidationRules(Request $request): void
4848
{
4949
$this->validator->setRules([
5050
'token' => [

src/Module/Templates/DemoApi/src/Middlewares/BaseMiddleware.php.tpl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
namespace {{MODULE_NAMESPACE}}\Middlewares;
1616

17-
use Quantum\Validation\Validator;
1817
use Quantum\Http\Enums\StatusCode;
1918
use Quantum\Middleware\Middleware;
19+
use Quantum\Validation\Validator;
2020
use Quantum\Http\Response;
2121
use Quantum\Http\Request;
2222
use Closure;
@@ -42,7 +42,7 @@ abstract class BaseMiddleware extends Middleware
4242
/**
4343
* Define validation rules specific to middleware.
4444
*/
45-
protected function defineValidationRules(Request $request)
45+
protected function defineValidationRules(Request $request): void
4646
{
4747
// default no-op: subclasses override if needed
4848
}
@@ -62,10 +62,7 @@ abstract class BaseMiddleware extends Middleware
6262
/**
6363
* Handles error response logic.
6464
*/
65-
protected function respondWithError(Request $request,
66-
$message,
67-
int $status = StatusCode::UNPROCESSABLE_ENTITY
68-
): Response
65+
protected function respondWithError(Request $request, $message, int $status = StatusCode::UNPROCESSABLE_ENTITY): Response
6966
{
7067
return response()->json([
7168
'status' => 'error',

src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Comment extends BaseMiddleware
3737
/**
3838
* @inheritDoc
3939
*/
40-
protected function defineValidationRules(Request $request)
40+
protected function defineValidationRules(Request $request): void
4141
{
4242
$this->validator->setRules([
4343
'content' => [

src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class Editor extends BaseMiddleware
6363
/**
6464
* @inheritDoc
6565
*/
66-
protected function defineValidationRules(Request $request)
66+
protected function defineValidationRules(Request $request): void
6767
{
6868
if ($request->hasFile('image')) {
6969
$this->validator->setRules([

src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Password extends BaseMiddleware
4141
/**
4242
* @inheritDoc
4343
*/
44-
protected function defineValidationRules(Request $request)
44+
protected function defineValidationRules(Request $request): void
4545
{
4646
$this->registerCustomRules($request);
4747

src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Signup extends BaseMiddleware
3838
/**
3939
* @inheritDoc
4040
*/
41-
protected function defineValidationRules(Request $request)
41+
protected function defineValidationRules(Request $request): void
4242
{
4343
$this->validator->setRules([
4444
'email' => [

src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Update extends BaseMiddleware
3939
/**
4040
* @inheritDoc
4141
*/
42-
protected function defineValidationRules(Request $request)
42+
protected function defineValidationRules(Request $request): void
4343
{
4444
$this->validator->setRules([
4545
'firstname' => [

src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Verify extends BaseMiddleware
4040
/**
4141
* @inheritDoc
4242
*/
43-
protected function defineValidationRules(Request $request)
43+
protected function defineValidationRules(Request $request): void
4444
{
4545
$this->validator->setRules([
4646
'otp' => [

src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Activate extends BaseMiddleware
4545
/**
4646
* @inheritDoc
4747
*/
48-
protected function defineValidationRules(Request $request)
48+
protected function defineValidationRules(Request $request): void
4949
{
5050
$this->validator->setRules([
5151
'token' => [

0 commit comments

Comments
 (0)