From 4942fdbfda4e2acfa094e48a3eeb6739f23aac46 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 14 Jan 2017 22:00:27 -0500 Subject: [PATCH] Use __DIR__ to make importing easier and only when required --- api/businesslogic/ValidationException.php | 18 +++++++++++++++ ...el.php => CreateTicketByCustomerModel.php} | 2 +- api/businesslogic/ticket/ticket_creator.php | 22 ++++++++++++++----- 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 api/businesslogic/ValidationException.php rename api/businesslogic/ticket/{CreateTicketForCustomerModel.php => CreateTicketByCustomerModel.php} (92%) diff --git a/api/businesslogic/ValidationException.php b/api/businesslogic/ValidationException.php new file mode 100644 index 00000000..3f174212 --- /dev/null +++ b/api/businesslogic/ValidationException.php @@ -0,0 +1,18 @@ +errorKeys) === 0) { + throw new Exception('Tried to throw a ValidationException, but the validation model was valid!'); + } + + $this->validationModel = $validationModel; + } +} \ No newline at end of file diff --git a/api/businesslogic/ticket/CreateTicketForCustomerModel.php b/api/businesslogic/ticket/CreateTicketByCustomerModel.php similarity index 92% rename from api/businesslogic/ticket/CreateTicketForCustomerModel.php rename to api/businesslogic/ticket/CreateTicketByCustomerModel.php index da4c233c..46840751 100644 --- a/api/businesslogic/ticket/CreateTicketForCustomerModel.php +++ b/api/businesslogic/ticket/CreateTicketByCustomerModel.php @@ -1,6 +1,6 @@ errorKeys) > 0) { + require_once(__DIR__ . '/../ValidationException.php'); + + // Validation failed + throw new ValidationException($validationModel); + } + + // Create the ticket } /** - * @param $ticket_request CreateTicketForCustomerModel + * @param $ticket_request CreateTicketByCustomerModel * @param $staff bool * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket */ function validate($ticket_request, $staff, $hesk_settings, $modsForHesk_settings) { - require_once('../email_validators.php'); + require_once(__DIR__ . '/../email_validators.php'); //require_once('../category/retriever.php'); //require_once('../bans/retriever.php');