From 5bbded2c034f152a37301612b51737b5b87aeace Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Thu, 16 Mar 2017 19:30:04 -0400 Subject: [PATCH] Correctly json_encode validation errors. --- app/Repositories/APIRepository.php | 2 +- app/Repositories/NodeRepository.php | 6 +++--- app/Repositories/OptionRepository.php | 4 ++-- app/Repositories/ServerRepository.php | 8 ++++---- app/Repositories/ServiceRepository.php | 4 ++-- app/Repositories/UserRepository.php | 4 ++-- app/Repositories/VariableRepository.php | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/Repositories/APIRepository.php b/app/Repositories/APIRepository.php index 5f148eda6..dc856e188 100644 --- a/app/Repositories/APIRepository.php +++ b/app/Repositories/APIRepository.php @@ -141,7 +141,7 @@ class APIRepository // Run validator, throw catchable and displayable exception if it fails. // Exception includes a JSON result of failed validation rules. if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } DB::beginTransaction(); diff --git a/app/Repositories/NodeRepository.php b/app/Repositories/NodeRepository.php index 2975da4e1..0c2c455c1 100644 --- a/app/Repositories/NodeRepository.php +++ b/app/Repositories/NodeRepository.php @@ -60,7 +60,7 @@ class NodeRepository // Run validator, throw catchable and displayable exception if it fails. // Exception includes a JSON result of failed validation rules. if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } // Verify the FQDN if using SSL @@ -109,7 +109,7 @@ class NodeRepository // Run validator, throw catchable and displayable exception if it fails. // Exception includes a JSON result of failed validation rules. if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } // Verify the FQDN @@ -193,7 +193,7 @@ class NodeRepository ]); if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } $explode = explode('/', $data['allocation_ip']); diff --git a/app/Repositories/OptionRepository.php b/app/Repositories/OptionRepository.php index 80a0a52a7..d0535b575 100644 --- a/app/Repositories/OptionRepository.php +++ b/app/Repositories/OptionRepository.php @@ -58,7 +58,7 @@ class OptionRepository ]); if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } if (isset($data['config_from'])) { @@ -141,7 +141,7 @@ class OptionRepository }); if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } if (isset($data['config_from'])) { diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php index f95d45431..adf05a293 100644 --- a/app/Repositories/ServerRepository.php +++ b/app/Repositories/ServerRepository.php @@ -114,7 +114,7 @@ class ServerRepository // Run validator, throw catchable and displayable exception if it fails. // Exception includes a JSON result of failed validation rules. if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } $user = Models\User::findOrFail($data['user_id']); @@ -360,7 +360,7 @@ class ServerRepository // Run validator, throw catchable and displayable exception if it fails. // Exception includes a JSON result of failed validation rules. if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } DB::beginTransaction(); @@ -437,7 +437,7 @@ class ServerRepository // Run validator, throw catchable and displayable exception if it fails. // Exception includes a JSON result of failed validation rules. if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } DB::beginTransaction(); @@ -492,7 +492,7 @@ class ServerRepository // Run validator, throw catchable and displayable exception if it fails. // Exception includes a JSON result of failed validation rules. if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } DB::beginTransaction(); diff --git a/app/Repositories/ServiceRepository.php b/app/Repositories/ServiceRepository.php index e8d606ffc..126feb647 100644 --- a/app/Repositories/ServiceRepository.php +++ b/app/Repositories/ServiceRepository.php @@ -48,7 +48,7 @@ class ServiceRepository ]); if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } return DB::transaction(function () use ($data) { @@ -94,7 +94,7 @@ class ServiceRepository ]); if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } return DB::transaction(function () use ($data, $service) { diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index e9cd8580f..714718cbd 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -67,7 +67,7 @@ class UserRepository // Run validator, throw catchable and displayable exception if it fails. // Exception includes a JSON result of failed validation rules. if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } DB::beginTransaction(); @@ -141,7 +141,7 @@ class UserRepository // Run validator, throw catchable and displayable exception if it fails. // Exception includes a JSON result of failed validation rules. if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } // The password and root_admin fields are not mass assignable. diff --git a/app/Repositories/VariableRepository.php b/app/Repositories/VariableRepository.php index c707788d3..ee6885280 100644 --- a/app/Repositories/VariableRepository.php +++ b/app/Repositories/VariableRepository.php @@ -63,7 +63,7 @@ class VariableRepository }); if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } if (isset($data['env_variable'])) { @@ -137,7 +137,7 @@ class VariableRepository }); if ($validator->fails()) { - throw new DisplayValidationException($validator->errors()); + throw new DisplayValidationException(json_encode($validator->errors())); } if (isset($data['env_variable'])) {