@@ -126,7 +126,7 @@ |
||
126 | 126 | /** |
127 | 127 | * Add a photo name to the photos array |
128 | 128 | * |
129 | - * @param $fileName |
|
129 | + * @param string $fileName |
|
130 | 130 | */ |
131 | 131 | public function addPhoto($fileName) |
132 | 132 | { |
@@ -58,6 +58,9 @@ |
||
58 | 58 | return $record; |
59 | 59 | } |
60 | 60 | |
61 | + /** |
|
62 | + * @param string $fobId |
|
63 | + */ |
|
61 | 64 | public static function lookupPartialTag($fobId) |
62 | 65 | { |
63 | 66 | $record = self::where('key_id', 'LIKE', '%' . strtoupper($fobId) . '%')->active()->first(); |
@@ -18,6 +18,9 @@ |
||
18 | 18 | return $this->belongsToMany('\BB\Entities\User')->withTimestamps(); |
19 | 19 | } |
20 | 20 | |
21 | + /** |
|
22 | + * @param string $name |
|
23 | + */ |
|
21 | 24 | public static function findByName($name) { |
22 | 25 | $role = self::where('name', $name)->first(); |
23 | 26 | if ($role) { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | /** |
42 | 42 | * Record the start of a new session |
43 | 43 | * |
44 | - * @return \Illuminate\Http\Response |
|
44 | + * @return \Illuminate\Http\JsonResponse |
|
45 | 45 | * |
46 | 46 | * @SWG\Post( |
47 | 47 | * path="/acs/activity", |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | /** |
81 | 81 | * Update an ongoing activity |
82 | 82 | * |
83 | - * @return \Illuminate\Http\Response |
|
83 | + * @return \Illuminate\Http\JsonResponse |
|
84 | 84 | * |
85 | 85 | * @SWG\Put( |
86 | 86 | * path="/acs/activity/{activityId}", |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | /** |
104 | 104 | * Show the form for creating a new resource. |
105 | 105 | * |
106 | - * @return \Illuminate\Http\Response |
|
106 | + * @return \Illuminate\Http\JsonResponse |
|
107 | 107 | * |
108 | 108 | * @SWG\Delete( |
109 | 109 | * path="/acs/activity/{activityId}", |
@@ -66,7 +66,7 @@ |
||
66 | 66 | /** |
67 | 67 | * Store a newly created resource in storage. |
68 | 68 | * |
69 | - * @return Response |
|
69 | + * @return \Illuminate\Http\JsonResponse |
|
70 | 70 | * @throws ImageFailedException |
71 | 71 | * @throws \BB\Exceptions\FormValidationException |
72 | 72 | */ |
@@ -33,8 +33,8 @@ discard block |
||
33 | 33 | * @return Response |
34 | 34 | * @throws \BB\Exceptions\AuthenticationException |
35 | 35 | */ |
36 | - public function index() |
|
37 | - { |
|
36 | + public function index() |
|
37 | + { |
|
38 | 38 | $userId = \Request::get('user_id', ''); |
39 | 39 | $sortBy = \Request::get('sortBy', 'created_at'); |
40 | 40 | $direction = \Request::get('direction', 'desc'); |
@@ -49,18 +49,18 @@ discard block |
||
49 | 49 | $expenses = $this->expenseRepository->getPaginated(compact('sortBy', 'direction')); |
50 | 50 | |
51 | 51 | return \View::make('expenses.index')->with('expenses', $expenses); |
52 | - } |
|
52 | + } |
|
53 | 53 | |
54 | 54 | |
55 | - /** |
|
56 | - * Show the form for creating a new resource. |
|
57 | - * |
|
58 | - * @return Response |
|
59 | - */ |
|
60 | - public function create() |
|
61 | - { |
|
62 | - // |
|
63 | - } |
|
55 | + /** |
|
56 | + * Show the form for creating a new resource. |
|
57 | + * |
|
58 | + * @return Response |
|
59 | + */ |
|
60 | + public function create() |
|
61 | + { |
|
62 | + // |
|
63 | + } |
|
64 | 64 | |
65 | 65 | |
66 | 66 | /** |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | * @throws ImageFailedException |
71 | 71 | * @throws \BB\Exceptions\FormValidationException |
72 | 72 | */ |
73 | - public function store() |
|
74 | - { |
|
75 | - $data = \Request::only(['user_id', 'category', 'description', 'amount', 'expense_date', 'file']); |
|
73 | + public function store() |
|
74 | + { |
|
75 | + $data = \Request::only(['user_id', 'category', 'description', 'amount', 'expense_date', 'file']); |
|
76 | 76 | |
77 | 77 | $this->expenseValidator->validate($data); |
78 | 78 | |
@@ -107,31 +107,31 @@ discard block |
||
107 | 107 | event(new NewExpenseSubmitted($expense)); |
108 | 108 | |
109 | 109 | return \Response::json($expense, 201); |
110 | - } |
|
110 | + } |
|
111 | 111 | |
112 | 112 | |
113 | - /** |
|
114 | - * Display the specified resource. |
|
115 | - * |
|
116 | - * @param int $id |
|
117 | - * @return Response |
|
118 | - */ |
|
119 | - public function show($id) |
|
120 | - { |
|
121 | - return \BB\Entities\Expense::findOrFail($id); |
|
122 | - } |
|
113 | + /** |
|
114 | + * Display the specified resource. |
|
115 | + * |
|
116 | + * @param int $id |
|
117 | + * @return Response |
|
118 | + */ |
|
119 | + public function show($id) |
|
120 | + { |
|
121 | + return \BB\Entities\Expense::findOrFail($id); |
|
122 | + } |
|
123 | 123 | |
124 | 124 | |
125 | - /** |
|
126 | - * Show the form for editing the specified resource. |
|
127 | - * |
|
128 | - * @param int $id |
|
129 | - * @return Response |
|
130 | - */ |
|
131 | - public function edit($id) |
|
132 | - { |
|
133 | - // |
|
134 | - } |
|
125 | + /** |
|
126 | + * Show the form for editing the specified resource. |
|
127 | + * |
|
128 | + * @param int $id |
|
129 | + * @return Response |
|
130 | + */ |
|
131 | + public function edit($id) |
|
132 | + { |
|
133 | + // |
|
134 | + } |
|
135 | 135 | |
136 | 136 | |
137 | 137 | /** |
@@ -141,8 +141,8 @@ discard block |
||
141 | 141 | * @return Response |
142 | 142 | * @throws \BB\Exceptions\AuthenticationException |
143 | 143 | */ |
144 | - public function update($id) |
|
145 | - { |
|
144 | + public function update($id) |
|
145 | + { |
|
146 | 146 | /** |
147 | 147 | if (\Request::ajax()) { |
148 | 148 | $data = \Request::only(['category', 'description', 'amount', 'expense_date']); |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | return $expense; |
154 | 154 | } |
155 | - */ |
|
155 | + */ |
|
156 | 156 | |
157 | 157 | if ( ! \Auth::user()->hasRole('admin')) { |
158 | 158 | throw new \BB\Exceptions\AuthenticationException(); |
@@ -167,20 +167,20 @@ discard block |
||
167 | 167 | } |
168 | 168 | |
169 | 169 | return \Redirect::route('expenses.index'); |
170 | - } |
|
170 | + } |
|
171 | 171 | |
172 | 172 | |
173 | - /** |
|
174 | - * Remove the specified resource from storage. |
|
175 | - * |
|
176 | - * @param int $id |
|
177 | - * @return Response |
|
178 | - */ |
|
179 | - public function destroy($id) |
|
180 | - { |
|
173 | + /** |
|
174 | + * Remove the specified resource from storage. |
|
175 | + * |
|
176 | + * @param int $id |
|
177 | + * @return Response |
|
178 | + */ |
|
179 | + public function destroy($id) |
|
180 | + { |
|
181 | 181 | //$expense = \BB\Entities\Expense::findOrFail($id); |
182 | 182 | //$expense->delete(); |
183 | - } |
|
183 | + } |
|
184 | 184 | |
185 | 185 | |
186 | 186 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * Locate a users active session |
63 | 63 | * @param integer $userId |
64 | 64 | * @param string $deviceKey |
65 | - * @return integer|false |
|
65 | + * @return integer |
|
66 | 66 | */ |
67 | 67 | public function findActiveUserSession($userId, $deviceKey) |
68 | 68 | { |
@@ -76,8 +76,8 @@ discard block |
||
76 | 76 | |
77 | 77 | /** |
78 | 78 | * Return an existing active session for the device, if any |
79 | - * @param $deviceKey |
|
80 | - * @return integer|false |
|
79 | + * @param string $deviceKey |
|
80 | + * @return integer |
|
81 | 81 | */ |
82 | 82 | public function findActiveDeviceSession($deviceKey) |
83 | 83 | { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | /** |
134 | 134 | * Return records that have been checked over |
135 | - * @param $deviceKey |
|
135 | + * @param string $deviceKey |
|
136 | 136 | * @return mixed |
137 | 137 | */ |
138 | 138 | public function getFinishedForEquipment($deviceKey) |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | /** |
144 | 144 | * @param string $deviceKey |
145 | 145 | * @param bool $billedTime |
146 | - * @param null $reason |
|
146 | + * @param string $reason |
|
147 | 147 | * @return int |
148 | 148 | */ |
149 | 149 | public function getTotalTime($deviceKey, $billedTime = null, $reason = null) |
@@ -2,6 +2,6 @@ |
||
2 | 2 | |
3 | 3 | abstract class Event { |
4 | 4 | |
5 | - // |
|
5 | + // |
|
6 | 6 | |
7 | 7 | } |
@@ -9,43 +9,43 @@ discard block |
||
9 | 9 | |
10 | 10 | class Handler extends ExceptionHandler { |
11 | 11 | |
12 | - /** |
|
13 | - * A list of the exception types that should not be reported. |
|
14 | - * |
|
15 | - * @var array |
|
16 | - */ |
|
17 | - protected $dontReport = [ |
|
12 | + /** |
|
13 | + * A list of the exception types that should not be reported. |
|
14 | + * |
|
15 | + * @var array |
|
16 | + */ |
|
17 | + protected $dontReport = [ |
|
18 | 18 | HttpException::class, |
19 | 19 | NotFoundHttpException::class, |
20 | 20 | ModelNotFoundException::class, |
21 | 21 | MethodNotAllowedHttpException::class, |
22 | 22 | FormValidationException::class, |
23 | 23 | AuthenticationException::class, //These are logged separately below |
24 | - ]; |
|
24 | + ]; |
|
25 | 25 | |
26 | - /** |
|
27 | - * Report or log an exception. |
|
28 | - * |
|
29 | - * This is a great spot to send exceptions to Sentry, Bugsnag, etc. |
|
30 | - * |
|
31 | - * @param \Exception $e |
|
32 | - * @return void |
|
33 | - */ |
|
34 | - public function report(Exception $e) |
|
35 | - { |
|
26 | + /** |
|
27 | + * Report or log an exception. |
|
28 | + * |
|
29 | + * This is a great spot to send exceptions to Sentry, Bugsnag, etc. |
|
30 | + * |
|
31 | + * @param \Exception $e |
|
32 | + * @return void |
|
33 | + */ |
|
34 | + public function report(Exception $e) |
|
35 | + { |
|
36 | 36 | //The parent will log exceptions that aren't of the types above |
37 | - parent::report($e); |
|
38 | - } |
|
37 | + parent::report($e); |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Render an exception into an HTTP response. |
|
42 | - * |
|
43 | - * @param \Illuminate\Http\Request $request |
|
44 | - * @param \Exception $e |
|
45 | - * @return \Illuminate\Http\Response |
|
46 | - */ |
|
47 | - public function render($request, Exception $e) |
|
48 | - { |
|
40 | + /** |
|
41 | + * Render an exception into an HTTP response. |
|
42 | + * |
|
43 | + * @param \Illuminate\Http\Request $request |
|
44 | + * @param \Exception $e |
|
45 | + * @return \Illuminate\Http\Response |
|
46 | + */ |
|
47 | + public function render($request, Exception $e) |
|
48 | + { |
|
49 | 49 | if ($e instanceof FormValidationException) { |
50 | 50 | if ($request->wantsJson()) { |
51 | 51 | return \Response::json($e->getErrors(), 422); |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | return \Response::json(['error' => $e->getMessage()], $e->getStatusCode()); |
93 | 93 | } |
94 | 94 | } |
95 | - return parent::render($request, $e); |
|
96 | - } |
|
95 | + return parent::render($request, $e); |
|
96 | + } |
|
97 | 97 | |
98 | 98 | /** |
99 | 99 | * Render an exception using Whoops. |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | class AuthController extends Controller { |
9 | 9 | |
10 | - /* |
|
10 | + /* |
|
11 | 11 | |-------------------------------------------------------------------------- |
12 | 12 | | Registration & Login Controller |
13 | 13 | |-------------------------------------------------------------------------- |
@@ -18,21 +18,21 @@ discard block |
||
18 | 18 | | |
19 | 19 | */ |
20 | 20 | |
21 | - use AuthenticatesAndRegistersUsers; |
|
21 | + use AuthenticatesAndRegistersUsers; |
|
22 | 22 | |
23 | - /** |
|
24 | - * Create a new authentication controller instance. |
|
25 | - * |
|
26 | - * @param \Illuminate\Contracts\Auth\Guard $auth |
|
27 | - * @param \Illuminate\Contracts\Auth\Registrar $registrar |
|
28 | - * @return void |
|
29 | - */ |
|
30 | - public function __construct(Guard $auth, Registrar $registrar) |
|
31 | - { |
|
32 | - $this->auth = $auth; |
|
33 | - $this->registrar = $registrar; |
|
23 | + /** |
|
24 | + * Create a new authentication controller instance. |
|
25 | + * |
|
26 | + * @param \Illuminate\Contracts\Auth\Guard $auth |
|
27 | + * @param \Illuminate\Contracts\Auth\Registrar $registrar |
|
28 | + * @return void |
|
29 | + */ |
|
30 | + public function __construct(Guard $auth, Registrar $registrar) |
|
31 | + { |
|
32 | + $this->auth = $auth; |
|
33 | + $this->registrar = $registrar; |
|
34 | 34 | |
35 | - $this->middleware('guest', ['except' => 'getLogout']); |
|
36 | - } |
|
35 | + $this->middleware('guest', ['except' => 'getLogout']); |
|
36 | + } |
|
37 | 37 | |
38 | 38 | } |