librenms / librenmsv2

app/DataTables/DeviceDataTable.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 
 namespace App\DataTables;
 
-use App\Models\DeviceGroup;
 use App\Models\Device;
 
 class DeviceDataTable extends BaseDataTable

app/Http/Controllers/DeviceController.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\DataTables\DeviceDataTable;
-use App\DataTables\DeviceGroupDataTable;
 use App\Models\DeviceGroup;
 use Dingo\Api\Http;
 use Dingo\Api\Routing\Helpers;

Spacing +2 added lines, -2 removed lines

@@ -18,10 +18,10 @@
      *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
      */
-    public function index(DeviceDataTable $dataTable, $group_id=-1)
+    public function index(DeviceDataTable $dataTable, $group_id = -1)
     {
         $group_name = "";
-        if($group_id >= 0) {
+        if ($group_id >= 0) {
             $dataTable->addScope(new \App\DataTables\Scopes\DeviceGroup($group_id));
             $group_name = DeviceGroup::find($group_id)->name;
         }

app/Http/Controllers/DeviceGroupController.php

Doc Comments +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function store(DeviceGroupRequest $request)
     {
@@ -71,7 +71,7 @@ 
      * Display the specified resource.
      *
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function show($id)
     {
@@ -95,7 +95,7 @@ 
      *
      * @param  \Illuminate\Http\Request $request
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(DeviceGroupRequest $request, $id)
     {
@@ -110,7 +110,7 @@ 
      *
      * @param \Illuminate\Http\Request $request
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      * @throws \Exception
      */
     public function destroy(AdminOnlyRequest $request, $id)

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\Api\Controllers;
 
 use DB;
-use App\Http\Requests;
 use Illuminate\Http\Request;
 
 class ApiController extends Controller

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 +2 added lines, -2 removed lines

@@ -211,7 +211,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);
             }
@@ -260,7 +260,7 @@ 
         $related = $this->getRelation('deviceCountRelation')->first();
 
         // then return the count directly
-        return ($related) ? (int)$related->count : 0;
+        return ($related) ? (int) $related->count : 0;
     }
 
     /**

Braces +16 added lines, -8 removed lines

@@ -97,7 +97,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) {
@@ -136,7 +137,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
 
@@ -147,14 +149,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
             }
@@ -185,7 +191,8 @@ 
         // add ends appropriately
         if ($startAnchor && !$endAnchor) {
             $pattern .= '%';
-        } elseif (!$startAnchor && $endAnchor) {
+        }
+        elseif (!$startAnchor && $endAnchor) {
             $pattern = '%'.$pattern;
         }
 
@@ -220,7 +227,8 @@ 
         if (str_contains($pattern, 'macros.')) {
             if (++$x < 30) {
                 $pattern = self::applyGroupMacros($pattern, $x);
-            } else {
+            }
+            else {
                 return false;
             }
         }

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) {