sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some error handling

This commit is contained in:
Dane Everitt 2018-01-27 13:26:43 -06:00
parent 8afced3410
commit 97ee95b4da
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Exceptions/Handler.php
View File

@ -83,14 +83,14 @@ class Handler extends ExceptionHandler
$cleaned[] = snake_case($reason); $cleaned[] = snake_case($reason);
} }
return [$field => $cleaned]; return [str_replace('.', '_', $field) => $cleaned];
})->toArray(); })->toArray();
$errors = collect($exception->errors())->map(function ($errors, $field) use ($codes) { $errors = collect($exception->errors())->map(function ($errors, $field) use ($codes) {
$response = []; $response = [];
foreach ($errors as $key => $error) { foreach ($errors as $key => $error) {
$response[] = [ $response[] = [
'code' => array_get($codes, $field . '.' . $key), 'code' => array_get($codes, str_replace('.', '_', $field) . '.' . $key),
'detail' => $error, 'detail' => $error,
'source' => ['field' => $field], 'source' => ['field' => $field],
]; ];

5
app/Http/Controllers/Api/Application/Nodes/AllocationController.php
View File

@ -26,11 +26,6 @@ class AllocationController extends ApplicationApiController
*/ */
private $deletionService; private $deletionService;
/**
* @var \Spatie\Fractal\Fractal
*/
private $fractal;
/** /**
* @var \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface * @var \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface
*/ */