Skip to content

Commit f30f45f

Browse files
authored
Merge pull request laravel#417 from eurides-eu/fix-partial-request-change
fix partial user update request
2 parents 0a6b3ff + a663b81 commit f30f45f

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

app/Http/Requests/Users/PartialUpdateUserRequest.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,23 @@ public function rules()
99
$rules = parent::rules(); // TODO: Change the autogenerated stub
1010
$result = [];
1111
foreach ($rules as $rule => $values) {
12-
if (is_array($values) && 'nullable' !== $values[0]) {
13-
array_unshift($values, 'nullable');
12+
if (!is_array($values)) {
13+
$values = explode('|', $values);
14+
}
15+
16+
if (in_array('required', $values, true)) {
17+
$values = array_filter($values, function ($value) {
18+
return 'required' !== $value;
19+
});
1420
}
15-
if (!is_array($values) && !starts_with($values, 'nullable|')) {
16-
$values = 'nullable|' . $values;
21+
if (in_array('present', $values, true)) {
22+
$values = array_filter($values, function ($value) {
23+
return 'present' !== $value;
24+
});
25+
}
26+
27+
if (in_array('nullable', $values, true)) {
28+
array_unshift($values, 'nullable');
1729
}
1830
$result[$rule] = $values;
1931
}

0 commit comments

Comments
 (0)