Skip to content

Commit f33486b

Browse files
committed
Small fixes found
1 parent fa6683b commit f33486b

File tree

4 files changed

+47
-2
lines changed

4 files changed

+47
-2
lines changed

config/sets/type-declaration.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77

88
$rectorConfig->import(__DIR__ . '/type-declaration/eloquent.php');
99
$rectorConfig->import(__DIR__ . '/type-declaration/service-container.php');
10+
$rectorConfig->import(__DIR__ . '/type-declaration/validation.php');
1011
};

config/sets/type-declaration/validation.php

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,33 @@
4242
);
4343
}
4444

45+
$rectorConfig->ruleWithConfiguration(
46+
AddParamTypeForFunctionLikeWithinCallLikeArgArrayValuesDeclarationRector::class,
47+
[
48+
new AddParamTypeForFunctionLikeWithinCallLikeArgDeclaration(
49+
'Illuminate\Http\Request',
50+
'validate',
51+
0,
52+
0,
53+
new \PHPStan\Type\StringType(),
54+
),
55+
new AddParamTypeForFunctionLikeWithinCallLikeArgDeclaration(
56+
'Illuminate\Http\Request',
57+
'validate',
58+
0,
59+
1,
60+
new \PHPStan\Type\MixedType(true),
61+
),
62+
new AddParamTypeForFunctionLikeWithinCallLikeArgDeclaration(
63+
'Illuminate\Http\Request',
64+
'validate',
65+
0,
66+
2,
67+
new \PHPStan\Type\ObjectType('Closure'),
68+
),
69+
]
70+
);
71+
4572
$rectorConfig->ruleWithConfiguration(
4673
AddParamTypeForFunctionLikeWithinCallLikeArgDeclarationRector::class,
4774
[
@@ -70,7 +97,7 @@
7097
'sometimes',
7198
2,
7299
1,
73-
new \PHPStan\Type\ObjectType('Illuminate\Support\Fluent'),
100+
new \PHPStan\Type\MixedType(true),
74101
),
75102
]
76103
);
@@ -98,6 +125,13 @@
98125
$rectorConfig->ruleWithConfiguration(
99126
AddParamTypeForFunctionLikeWithinCallLikeArgDeclarationRector::class,
100127
[
128+
new AddParamTypeForFunctionLikeWithinCallLikeArgDeclaration(
129+
'Illuminate\Validation\Rules\Exists',
130+
'where',
131+
0,
132+
0,
133+
new \PHPStan\Type\ObjectType('Illuminate\Contracts\Database\Query\Builder'),
134+
),
101135
new AddParamTypeForFunctionLikeWithinCallLikeArgDeclaration(
102136
'Illuminate\Validation\Rules\Exists',
103137
'where',

tests/Sets/TypeDeclaration/Validation/Fixture/apply-to-rule.php.inc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ use Illuminate\Validation\Rule;
77
Rule::forEach(function ($value, $attribute) {
88
});
99

10+
/** @var \Illuminate\Validation\Rules\Exists $exists */
11+
$exists->where(function ($query) {
12+
$query->where('column', 'value');
13+
});
14+
1015
/** @var \Illuminate\Validation\Rules\Exists $exists */
1116
$exists->where('column', function ($query) {
1217
$query->where('column', 'value');
@@ -27,6 +32,11 @@ use Illuminate\Validation\Rule;
2732
Rule::forEach(function (mixed $value, string $attribute) {
2833
});
2934

35+
/** @var \Illuminate\Validation\Rules\Exists $exists */
36+
$exists->where(function (\Illuminate\Contracts\Database\Query\Builder $query) {
37+
$query->where('column', 'value');
38+
});
39+
3040
/** @var \Illuminate\Validation\Rules\Exists $exists */
3141
$exists->where('column', function (\Illuminate\Contracts\Database\Query\Builder $query) {
3242
$query->where('column', 'value');

tests/Sets/TypeDeclaration/Validation/Fixture/apply-to-validator.php.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ $validator->after(function (\Illuminate\Contracts\Validation\Validator $validato
3434
}
3535
});
3636

37-
$validator->sometimes('reason', 'required|max:500', function (\Illuminate\Support\Fluent $input, \Illuminate\Support\Fluent $item) {
37+
$validator->sometimes('reason', 'required|max:500', function (\Illuminate\Support\Fluent $input, mixed $item) {
3838
return $input->games >= 100;
3939
});
4040

0 commit comments

Comments
 (0)