Improve error messaging for validation exceptions

This commit is contained in:
DaneEveritt 2022-06-26 16:31:48 -04:00
parent 271197e823
commit 43156e8d53
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 31 additions and 11 deletions

View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Exceptions\Model;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Validation\Validator;
use Pterodactyl\Exceptions\PterodactylException;
use Illuminate\Contracts\Support\MessageProvider;
@ -11,21 +12,30 @@ class DataValidationException extends PterodactylException implements HttpExcept
{
/**
* The validator instance.
*
* @var \Illuminate\Contracts\Validation\Validator
*/
public $validator;
protected Validator $validator;
/**
* The underlying model instance that triggered this exception.
*/
protected Model $model;
/**
* DataValidationException constructor.
*/
public function __construct(Validator $validator)
public function __construct(Validator $validator, Model $model)
{
parent::__construct(
'Data integrity exception encountered while performing database write operation. ' . $validator->errors()->toJson()
$message = sprintf(
'Could not save %s[%s]: failed to validate data: %s',
get_class($model),
$model->getKey(),
$validator->errors()->toJson()
);
parent::__construct($message);
$this->validator = $validator;
$this->model = $model;
}
/**
@ -55,4 +65,14 @@ class DataValidationException extends PterodactylException implements HttpExcept
{
return [];
}
public function getValidator(): Validator
{
return $this->validator;
}
public function getModel(): Model
{
return $this->model;
}
}