Completed
Pull Request — develop (#143)
by Tony
05:40
created
app/Http/Controllers/DeviceGroupController.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
      * Store a newly created resource in storage.
59 59
      *
60 60
      * @param  \Illuminate\Http\Request $request
61
-     * @return \Illuminate\Http\Response
61
+     * @return \Illuminate\Http\JsonResponse
62 62
      */
63 63
     public function store(DeviceGroupRequest $request)
64 64
     {
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
      * Display the specified resource.
72 72
      *
73 73
      * @param  int $id
74
-     * @return \Illuminate\Http\Response
74
+     * @return \Illuminate\Http\RedirectResponse
75 75
      */
76 76
     public function show($id)
77 77
     {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
      *
96 96
      * @param  \Illuminate\Http\Request $request
97 97
      * @param  int $id
98
-     * @return \Illuminate\Http\Response
98
+     * @return \Illuminate\Http\JsonResponse
99 99
      */
100 100
     public function update(DeviceGroupRequest $request, $id)
101 101
     {
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
      *
111 111
      * @param \Illuminate\Http\Request $request
112 112
      * @param  int $id
113
-     * @return \Illuminate\Http\Response
113
+     * @return \Illuminate\Http\JsonResponse
114 114
      * @throws \Exception
115 115
      */
116 116
     public function destroy(AdminOnlyRequest $request, $id)
Please login to merge, or discard this patch.
app/Models/DeviceGroup.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -203,7 +203,7 @@
 block discarded – undo
203 203
      * Convert a v1 device group pattern to v2 style
204 204
      *
205 205
      * @param $pattern
206
-     * @return array
206
+     * @return string
207 207
      */
208 208
     private function convertV1Pattern($pattern)
209 209
     {
Please login to merge, or discard this patch.
app/Http/Controllers/DeviceController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,10 +18,10 @@
 block discarded – undo
18 18
      *
19 19
      * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
20 20
      */
21
-    public function index(DeviceDataTable $dataTable, $group_id=-1)
21
+    public function index(DeviceDataTable $dataTable, $group_id = -1)
22 22
     {
23 23
         $group_name = "";
24
-        if($group_id >= 0) {
24
+        if ($group_id >= 0) {
25 25
             $dataTable->addScope(new \App\DataTables\Scopes\DeviceGroup($group_id));
26 26
             $group_name = DeviceGroup::find($group_id)->name;
27 27
         }
Please login to merge, or discard this patch.