Completed
Pull Request — develop (#67)
by Tony
06:27
created
app/Api/Controllers/APIController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
17 17
     public function list_devices(Request $request) {
18 18
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
19 19
             return Devices::all();
20
-        }
21
-        else {
20
+        } else {
22 21
             return User::find($request->user()->user_id)->devices()->get();
23 22
         }
24 23
     }
Please login to merge, or discard this patch.
app/Api/Controllers/DeviceController.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
19 19
     public function list_devices(Request $request) {
20 20
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
21 21
             return Device::all();
22
-        }
23
-        else {
22
+        } else {
24 23
             return User::find($request->user()->user_id)->devices()->get();
25 24
         }
26 25
     }
@@ -31,8 +30,7 @@  discard block
 block discarded – undo
31 30
     public function list_ports(Request $request) {
32 31
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
33 32
             return Port::all();
34
-        }
35
-        else {
33
+        } else {
36 34
             return User::find($request->user()->user_id)->ports()->get();
37 35
         }
38 36
     }
Please login to merge, or discard this patch.
app/Api/Controllers/PortController.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
19 19
     public function list_devices(Request $request) {
20 20
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
21 21
             return Device::all();
22
-        }
23
-        else {
22
+        } else {
24 23
             return User::find($request->user()->user_id)->devices()->get();
25 24
         }
26 25
     }
@@ -31,8 +30,7 @@  discard block
 block discarded – undo
31 30
     public function list_ports(Request $request) {
32 31
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
33 32
             return Port::all();
34
-        }
35
-        else {
33
+        } else {
36 34
             return User::find($request->user()->user_id)->ports()->get();
37 35
         }
38 36
     }
Please login to merge, or discard this patch.
app/Http/Controllers/NotificationController.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
17 17
     public function list_devices(Request $request) {
18 18
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
19 19
             return Devices::all();
20
-        }
21
-        else {
20
+        } else {
22 21
             return User::find($request->user()->user_id)->devices()->get();
23 22
         }
24 23
     }
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
     /**
45 45
      * Update a notifications status.
46 46
      *
47
-     * @return \Illuminate\Http\Response
47
+     * @return \Illuminate\Http\JsonResponse
48 48
      */
49 49
     public function update($id, $action)
50 50
     {
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     /**
56 56
      * Create a new notification
57 57
      *
58
-     * @return \Illuminate\Http\Response
58
+     * @return \Illuminate\Http\JsonResponse
59 59
      */
60 60
     public function create(Request $request)
61 61
     {
Please login to merge, or discard this patch.
app/Api/Transformers/PortTransformer.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
     /**
36 36
      * Include Device
37 37
      *
38
-     * @return League\Fractal\ItemResource
38
+     * @return Fractal\Resource\Item
39 39
      */
40 40
     public function includeDevice(Port $port)
41 41
     {
Please login to merge, or discard this patch.
app/Api/Controllers/NotificationController.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -27,8 +27,7 @@  discard block
 block discarded – undo
27 27
         if ($type === 'archive')
28 28
         {
29 29
             $notifications = Notification::IsArchived($request)->get();
30
-        }
31
-        else {
30
+        } else {
32 31
             $notifications = Notification::IsUnread()->get();
33 32
         }
34 33
         return $notifications;
@@ -45,15 +44,13 @@  discard block
 block discarded – undo
45 44
 
46 45
         if ($action == 'read') {
47 46
            $result = $notification->markRead($enable);
48
-        }
49
-        elseif ($action == 'sticky') {
47
+        } elseif ($action == 'sticky') {
50 48
            $result = $notification->markSticky(false);
51 49
         }
52 50
 
53 51
         if ($result === false) {
54 52
             return $this->response->errorInternal();
55
-        }
56
-        else {
53
+        } else {
57 54
             return $this->response->array(array('statusText' => 'OK'));
58 55
         }
59 56
     }
@@ -73,8 +70,7 @@  discard block
 block discarded – undo
73 70
         if ($notification->save())
74 71
         {
75 72
             return $this->response->array(array('statusText' => 'OK'));
76
-        }
77
-        else {
73
+        } else {
78 74
             return $this->response->errorInternal();
79 75
         }
80 76
     }
Please login to merge, or discard this patch.
app/Http/Controllers/UserController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
17 17
     public function list_devices(Request $request) {
18 18
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
19 19
             return Devices::all();
20
-        }
21
-        else {
20
+        } else {
22 21
             return User::find($request->user()->user_id)->devices()->get();
23 22
         }
24 23
     }
Please login to merge, or discard this patch.
app/Models/Notification.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -42,6 +42,9 @@
 block discarded – undo
42 42
         $this->setAttrib('sticky', $enabled);
43 43
     }
44 44
 
45
+    /**
46
+     * @param string $name
47
+     */
45 48
     private function setAttrib($name, $enabled) {
46 49
         if ($enabled === true) {
47 50
             $read = new NotificationAttrib;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
17 17
     public function list_devices(Request $request) {
18 18
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
19 19
             return Devices::all();
20
-        }
21
-        else {
20
+        } else {
22 21
             return User::find($request->user()->user_id)->devices()->get();
23 22
         }
24 23
     }
Please login to merge, or discard this patch.
app/Models/User.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     /**
32 32
      * Test if the User is an admin or demo.
33 33
      *
34
-     * @return \Illuminate\Database\Eloquent\Builder
34
+     * @return boolean
35 35
      */
36 36
     public function isAdmin()
37 37
     {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      * Test if this user has global read access
43 43
      * these users have a level of 5, 10 or 11 (demo).
44 44
      *
45
-     * @return \Illuminate\Database\Eloquent\Builder
45
+     * @return boolean
46 46
      */
47 47
     public function hasGlobalRead()
48 48
     {
Please login to merge, or discard this patch.