Completed
Pull Request — master (#27)
by Brandon
02:01
created
app/Http/Controllers/ApiController.php 2 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
     /**
12 12
      * Creates a json response for all the devices.
13 13
      *
14
-     * @return Response
14
+     * @return \Illuminate\Http\JsonResponse
15 15
      */    
16 16
     public function index()
17 17
     {
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
      * Creates a json response for a specifc device.
24 24
      *
25 25
      * @param  Device  $device
26
-     * @return Response
26
+     * @return \Illuminate\Http\JsonResponse
27 27
      */    
28 28
     public function show(Device $device)
29 29
     {
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      * Updates the status of a device.
35 35
      *
36 36
      * @param  Request  $request
37
-     * @return Response
37
+     * @return \Illuminate\Http\JsonResponse
38 38
      */
39 39
     public function update(Request $request)
40 40
     {
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
      * Registers a new device.
106 106
      *
107 107
      * @param  Request  $request
108
-     * @return Response
108
+     * @return \Illuminate\Http\JsonResponse
109 109
      */
110 110
     public function register(Request $request)
111 111
     {
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         
61 61
         // If validation fails, send the validation error back with status 400
62 62
         if ($validator->fails()) {
63
-            return response()->json(['data' => $validator->toArray()], 400);
63
+            return response()->json([ 'data' => $validator->toArray() ], 400);
64 64
         }
65 65
         
66 66
         // Get the device record
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
         
69 69
         // If token doesnt match then send 401 unauthorized.
70 70
         if ($request->input('token') != $device->token) {
71
-            return response()->json(['data' => 'Bad token.'], 401);
71
+            return response()->json([ 'data' => 'Bad token.' ], 401);
72 72
         }
73 73
         
74 74
         // Update the device
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
         //event(new Registered(true));
99 99
         
100 100
         // Return the new device info including the token.
101
-        return response()->json(['data' => $device->toArray()], 201);
101
+        return response()->json([ 'data' => $device->toArray() ], 201);
102 102
     }
103 103
     
104 104
     /**
@@ -117,12 +117,12 @@  discard block
 block discarded – undo
117 117
         
118 118
         // If validation fails, send the validation error back with status 400
119 119
         if ($validator->fails()) {
120
-            return response()->json(['data' => $validator->toArray()], 400);
120
+            return response()->json([ 'data' => $validator->toArray() ], 400);
121 121
         }
122 122
         
123 123
         // If challenge string doesnt match then send 401 unauthorized.
124 124
         if ($request->input('challenge') != 'temppass') {
125
-            return response()->json(['data' => 'Bad challenge.'], 401);
125
+            return response()->json([ 'data' => 'Bad challenge.' ], 401);
126 126
         }
127 127
         
128 128
         // If the uuid already exists then just send them the record.
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
                 'uuid' => $device->uuid,
133 133
                 'id' => $device->id,
134 134
                 'token' => $device->token,
135
-            ]], 200);
135
+            ] ], 200);
136 136
         }
137 137
         
138 138
         // Create the new device
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
             'uuid' => $device->uuid,
156 156
             'id' => $device->id,
157 157
             'token' => $device->token,
158
-        ]], 201);
158
+        ] ], 201);
159 159
     }
160 160
 }
161 161
 
Please login to merge, or discard this patch.
app/Device.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
      *
25 25
      * @var array
26 26
      */
27
-    protected $hidden = ['token'];
27
+    protected $hidden = [ 'token' ];
28 28
     
29 29
     /**
30 30
      * The attributes that are mass assignable.
Please login to merge, or discard this patch.