Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return the broken rule in the validation error response

Browse source
This commit is contained in:
Dane Everitt 2020-08-27 21:15:23 -07:00
parent 1967e3f7fd
commit f293c73977
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/Exceptions/Handler.php
View file

@ -169,14 +169,30 @@ class Handler extends ExceptionHandler
*/ */
public function invalidJson($request, ValidationException $exception) public function invalidJson($request, ValidationException $exception)
{ {
$errors = collect($exception->errors())->map(function ($errors, $field) use ($exception) { $codes = collect($exception->validator->failed())->mapWithKeys(function ($reasons, $field) {
$cleaned = [];
foreach ($reasons as $reason => $attrs) {
$cleaned[] = snake_case($reason);
}
return [str_replace('.', '_', $field) => $cleaned];
})->toArray();
$errors = collect($exception->errors())->map(function ($errors, $field) use ($codes, $exception) {
$response = []; $response = [];
foreach ($errors as $key => $error) { foreach ($errors as $key => $error) {
$converted = self::convertToArray($exception)['errors'][0]; $meta = [
$response[] = array_merge($converted, [
'detail' => $error,
'source_field' => $field, 'source_field' => $field,
]); 'rule' => str_replace(self::PTERODACTYL_RULE_STRING, 'p_', array_get(
$codes, str_replace('.', '_', $field) . '.' . $key
)),
];
$converted = self::convertToArray($exception)['errors'][0];
$converted['detail'] = $error;
$converted['meta'] = is_array($converted['meta']) ? array_merge($converted['meta'], $meta) : $meta;
$response[] = $converted;
} }
return $response; return $response;