@@ -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) { |
@@ -18,7 +18,8 @@ |
||
| 18 | 18 | return $this->belongsToMany('\BB\Entities\User')->withTimestamps(); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public static function findByName($name) { |
|
| 21 | + public static function findByName($name) |
|
| 22 | + { |
|
| 22 | 23 | $role = self::where('name', $name)->first(); |
| 23 | 24 | if ($role) { |
| 24 | 25 | return $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 | */ |
@@ -6,7 +6,8 @@ |
||
| 6 | 6 | use Illuminate\Support\Facades\Response; |
| 7 | 7 | use Illuminate\Support\Facades\Storage; |
| 8 | 8 | |
| 9 | -class ExpensesController extends Controller { |
|
| 9 | +class ExpensesController extends Controller |
|
| 10 | +{ |
|
| 10 | 11 | |
| 11 | 12 | /** |
| 12 | 13 | * @var \BB\Validators\ExpenseValidator |
@@ -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) |
@@ -35,7 +35,8 @@ |
||
| 35 | 35 | * @param string $hash |
| 36 | 36 | * @return Notification |
| 37 | 37 | */ |
| 38 | - public static function logNew($userId, $message, $type, $hash) { |
|
| 38 | + public static function logNew($userId, $message, $type, $hash) |
|
| 39 | + { |
|
| 39 | 40 | $existingNotifications = Notification::where('user_id', $userId)->where('hash', $hash)->first(); |
| 40 | 41 | if ($existingNotifications) { |
| 41 | 42 | return $existingNotifications; |
@@ -1,6 +1,7 @@ |
||
| 1 | 1 | <?php namespace BB\Events; |
| 2 | 2 | |
| 3 | -abstract class Event { |
|
| 3 | +abstract class Event |
|
| 4 | +{ |
|
| 4 | 5 | |
| 5 | 6 | // |
| 6 | 7 | |
@@ -7,7 +7,8 @@ discard block |
||
| 7 | 7 | use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; |
| 8 | 8 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 9 | 9 | |
| 10 | -class Handler extends ExceptionHandler { |
|
| 10 | +class Handler extends ExceptionHandler |
|
| 11 | +{ |
|
| 11 | 12 | |
| 12 | 13 | /** |
| 13 | 14 | * A list of the exception types that should not be reported. |
@@ -82,8 +83,7 @@ discard block |
||
| 82 | 83 | $e = new HttpException(404, $e->getMessage()); |
| 83 | 84 | } |
| 84 | 85 | |
| 85 | - if (config('app.debug') && $this->shouldReport($e) && !$request->wantsJson()) |
|
| 86 | - { |
|
| 86 | + if (config('app.debug') && $this->shouldReport($e) && !$request->wantsJson()) { |
|
| 87 | 87 | return $this->renderExceptionWithWhoops($e); |
| 88 | 88 | } |
| 89 | 89 | |