mirror of
https://github.com/flarum/core.git
synced 2025-08-19 06:41:44 +02:00
Distinguish between attributes/relationships in ValidationException
This exception could be a candidate for inclusion in tobscure/json-api...
This commit is contained in:
@@ -30,18 +30,23 @@ class ValidationExceptionHandler implements ExceptionHandlerInterface
|
||||
*/
|
||||
public function handle(Exception $e)
|
||||
{
|
||||
$status = 422;
|
||||
$errors = array_merge(
|
||||
$this->buildErrors($e->getAttributes(), '/data/attributes'),
|
||||
$this->buildErrors($e->getRelationships(), '/data/relationships')
|
||||
);
|
||||
|
||||
$messages = $e->getMessages();
|
||||
$errors = array_map(function ($path, $detail) use ($status) {
|
||||
return new ResponseBag(422, $errors);
|
||||
}
|
||||
|
||||
private function buildErrors(array $messages, $pointer)
|
||||
{
|
||||
return array_map(function ($path, $detail) use ($pointer) {
|
||||
return [
|
||||
'status' => (string) $status,
|
||||
'status' => '422',
|
||||
'code' => 'validation_error',
|
||||
'detail' => $detail,
|
||||
'source' => ['pointer' => "/data/attributes/$path"]
|
||||
'source' => ['pointer' => $pointer.'/'.$path]
|
||||
];
|
||||
}, array_keys($messages), $messages);
|
||||
|
||||
return new ResponseBag($status, $errors);
|
||||
}
|
||||
}
|
||||
|
@@ -14,17 +14,26 @@ use Exception;
|
||||
|
||||
class ValidationException extends Exception
|
||||
{
|
||||
protected $messages;
|
||||
protected $attributes;
|
||||
protected $relationships;
|
||||
|
||||
public function __construct(array $messages)
|
||||
public function __construct(array $attributes, array $relationships = [])
|
||||
{
|
||||
$this->messages = $messages;
|
||||
$this->attributes = $attributes;
|
||||
$this->relationships = $relationships;
|
||||
|
||||
$messages = [implode("\n", $attributes), implode("\n", $relationships)];
|
||||
|
||||
parent::__construct(implode("\n", $messages));
|
||||
}
|
||||
|
||||
public function getMessages()
|
||||
public function getAttributes()
|
||||
{
|
||||
return $this->messages;
|
||||
return $this->attributes;
|
||||
}
|
||||
|
||||
public function getRelationships()
|
||||
{
|
||||
return $this->relationships;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user