murrant / librenmsv2

app/Http/Middleware/Authenticate.php

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
         if (Auth::guard($guard)->guest()) {
             if ($request->ajax() || $request->wantsJson()) {
                 return response('Unauthorized.', 401);
-            } else {
+            }
+            else {
                 return redirect()->guest('login');
             }
         }

app/Models/DbConfig.php

Braces +2 added lines, -1 removed lines

@@ -102,7 +102,8 @@
             } catch(\Exception $e) {
                 if(starts_with($e->getMessage(), 'unserialize():')) {
                     return $value;
-                } else {
+                }
+                else {
                     throw $e;
                 }
             }

app/Http/Requests/UpdateUserRequest.php

Indentation +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     {
         if ($this->input('password')) {
             $rules = ['password'              => 'required|min:5|max:255',
-                      'password_confirmation' => 'required|same:password',
+                        'password_confirmation' => 'required|same:password',
             ];
             if (!Auth::user()->isAdmin()) {
                 $rules['current_password'] = 'required|password:user_id';

Braces +2 added lines, -1 removed lines

@@ -195,7 +195,8 @@
         $user = \Auth::user();
         if (!is_null($user) && $user->isAdmin()) {
             return false;
-        } else {
+        }
+        else {
             return 'auth';
         }
     }

app/Http/Controllers/UserController.php

Doc Comments +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     /**
      * Update a notifications status.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update($id, $action)
     {
@@ -55,7 +55,7 @@ 
     /**
      * Create a new notification
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function create(Request $request)
     {

Braces +2 added lines, -1 removed lines

@@ -195,7 +195,8 @@
         $user = \Auth::user();
         if (!is_null($user) && $user->isAdmin()) {
             return false;
-        } else {
+        }
+        else {
             return 'auth';
         }
     }

app/Http/Controllers/SettingsController.php

Braces +2 added lines, -1 removed lines

@@ -76,7 +76,8 @@
         if ($type == 'settings-value') {
             Settings::set($key, Input::get('value'));
             return response('OK', 200);
-        } elseif ($type == 'settings-array') {
+        }
+        elseif ($type == 'settings-array') {
             $new = Input::get('value');
             $current = Settings::get($key);
 

app/DataTables/Scopes/DeviceGroup.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      */
     public function apply($query)
     {
-        return $query->whereHas('groups', function ($q) {
+        return $query->whereHas('groups', function($q) {
             $q->where('id', '=', $this->group_id);
         });
     }

app/Http/Controllers/DeviceGroupController.php

Doc Comments +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function store(Request $request)
     {
@@ -70,7 +70,7 @@ 
      * Display the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function show($id)
     {
@@ -94,7 +94,7 @@ 
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(Request $request, $id)
     {
@@ -108,7 +108,7 @@ 
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function destroy($id)
     {

Braces +2 added lines, -1 removed lines

@@ -195,7 +195,8 @@
         $user = \Auth::user();
         if (!is_null($user) && $user->isAdmin()) {
             return false;
-        } else {
+        }
+        else {
             return 'auth';
         }
     }

app/Models/DeviceGroup.php

Doc Comments +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
      * Convert a v1 device group pattern to v2 style
      *
      * @param $pattern
-     * @return array
+     * @return string
      */
     private function convertV1Pattern($pattern)
     {

Spacing +3 added lines, -3 removed lines

@@ -169,7 +169,7 @@ 
         }
 
         foreach (Settings::get('alert.macros.group', []) as $macro => $value) {
-            $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value);  // this might need something more complex
+            $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value); // this might need something more complex
             if (!str_contains($macro, ' ')) {
                 $pattern = str_replace('macros.'.$macro, '('.$value.')', $pattern);
             }
@@ -224,7 +224,7 @@ 
         }
 
         // fill in parameters
-        foreach ((array)$this->params as $value) {
+        foreach ((array) $this->params as $value) {
             if (!is_numeric($value) && !starts_with($value, "'")) {
                 $value = "'".$value."'";
             }
@@ -251,7 +251,7 @@ 
         $related = $this->getRelation('deviceCountRelation')->first();
 
         // then return the count directly
-        return ($related) ? (int)$related->count : 0;
+        return ($related) ? (int) $related->count : 0;
     }
 
     /**

Braces +20 added lines, -10 removed lines

@@ -123,7 +123,8 @@ 
                     // can't build sql
                     return [];
                 }
-            } else {
+            }
+            else {
                 $params = $this->params;
             }
         }
@@ -134,7 +135,8 @@ 
         $query = null;
         if (count($tables) == 1) {
             $query = DB::table($tables[0])->select('device_id')->distinct();
-        } else {
+        }
+        else {
             $query = DB::table('devices')->select('devices.device_id')->distinct();
 
             foreach ($tables as $table) {
@@ -150,7 +152,8 @@ 
         // match the device ids
         if (is_null($params)) {
             return $query->whereRaw($statement)->pluck('device_id');
-        } else {
+        }
+        else {
             return $query->whereRaw($statement, $params)->pluck('device_id');
         }
     }
@@ -178,7 +181,8 @@ 
         if (str_contains($pattern, 'macros.')) {
             if (++$x < 30) {
                 $pattern = self::applyGroupMacros($pattern, $x);
-            } else {
+            }
+            else {
                 return false;
             }
         }
@@ -309,7 +313,8 @@ 
             if (starts_with($cur, '%')) {
                 // table and column or macro
                 $out .= substr($cur, 1).' ';
-            } elseif (substr($cur, -1) == '~') {
+            }
+            elseif (substr($cur, -1) == '~') {
                 // like operator
                 $content = $parts[++$i]; // grab the content so we can format it
 
@@ -320,14 +325,18 @@ 
 
                 $out .= "LIKE('".$this->convertRegexToLike($content)."') ";
 
-            } elseif ($cur == '&&') {
+            }
+            elseif ($cur == '&&') {
                 $out .= 'AND ';
-            } elseif ($cur == '||') {
+            }
+            elseif ($cur == '||') {
                 $out .= 'OR ';
-            } elseif (in_array($cur, $ops)) {
+            }
+            elseif (in_array($cur, $ops)) {
                 // pass-through operators
                 $out .= $cur.' ';
-            } else {
+            }
+            else {
                 // user supplied input
                 $out .= "'".trim($cur, '"\'')."' "; // TODO: remove trim, only needed with invalid input
             }
@@ -360,7 +369,8 @@ 
         // add ends appropriately
         if ($startAnchor && !$endAnchor) {
             $pattern .= '%';
-        } elseif (!$startAnchor && $endAnchor) {
+        }
+        elseif (!$startAnchor && $endAnchor) {
             $pattern = '%'.$pattern;
         }
 

app/QueryBuilderFilter.php

Doc Comments +3 added lines

@@ -38,6 +38,9 @@
         return json_encode(self::generateMacroFilter('alert.macros.rule', self::generateTableFilter()));
     }
 
+    /**
+     * @param string $setting
+     */
     private static function generateMacroFilter($setting, $filter = [])
     {
         foreach (Settings::get($setting, []) as $key => $value) {

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         }
 
         // return the table filter merged with $filter, fetch from cache if available
-        return array_merge($filter, Cache::rememberForever('query_builder_table_filter', function () {
+        return array_merge($filter, Cache::rememberForever('query_builder_table_filter', function() {
             $tableFilter = [];
             $schema = DB::getDoctrineSchemaManager();