From 16ef1dfb2f31f00051afb3d170264de3333d0ea0 Mon Sep 17 00:00:00 2001 From: vijaysebastian Date: Mon, 22 Feb 2016 04:35:35 -0500 Subject: [PATCH] Applied fixes from StyleCI --- app/Http/Controllers/Api/v1/ApiController.php | 23 +++++++++++-------- .../Controllers/Api/v1/TestController.php | 11 +++++---- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Api/v1/ApiController.php b/app/Http/Controllers/Api/v1/ApiController.php index e150d2cab..259f03cd6 100644 --- a/app/Http/Controllers/Api/v1/ApiController.php +++ b/app/Http/Controllers/Api/v1/ApiController.php @@ -1039,33 +1039,36 @@ class ApiController extends Controller } } - - public function getTicketById(){ - try{ + public function getTicketById() + { + try { $v = \Validator::make($this->request->all(), [ - 'id' => 'required|exists:tickets,id' + 'id' => 'required|exists:tickets,id', ]); if ($v->fails()) { $error = $v->errors(); + return response()->json(compact('error')); } $id = $this->request->input('id'); - if(!$this->model->where('id',$id)->first()){ - $error = "There is no Ticket as ticket id: ".$id; + if (!$this->model->where('id', $id)->first()) { + $error = 'There is no Ticket as ticket id: '.$id; + return response()->json(compact('error')); } - $result = $this->model->where('id',$id)->first(); + $result = $this->model->where('id', $id)->first(); + return response()->json(compact('result')); } catch (\Exception $e) { $error = $e->getMessage(); $line = $e->getLine(); $file = $e->getFile(); + return response()->json(compact('error', 'file', 'line')); - }catch (\TokenExpiredException $e) { + } catch (\TokenExpiredException $e) { $error = $e->getMessage(); + return response()->json(compact('error')); } } - - } diff --git a/app/Http/Controllers/Api/v1/TestController.php b/app/Http/Controllers/Api/v1/TestController.php index ab44bdc94..4e258fbbe 100644 --- a/app/Http/Controllers/Api/v1/TestController.php +++ b/app/Http/Controllers/Api/v1/TestController.php @@ -453,19 +453,20 @@ class TestController extends Controller } } - public function getTicketById(){ - try{ - $url = $this->server . "helpdesk/my-tickets?id=1&api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token'); + public function getTicketById() + { + try { + $url = $this->server.'helpdesk/my-tickets?id=1&api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token'); $_this = new self(); $respose = $_this->callGetApi($url); + return $respose; } catch (\Exception $e) { $error = $e->getMessage(); $line = $e->getLine(); $file = $e->getFile(); + return response()->json(compact('error', 'file', 'line')); } } - - }