murrant / librenmsv2

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

app/Http/Controllers/Widgets/WidgetDataController.php

Doc Comments -1 removed lines

@@ -60,7 +60,6 @@
     /**
      * Display the alerts widget.
      *
-     * @param AlertsDataTable $dataTable
      * @param null $action
      * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
      */

app/Models/DeviceGroup.php

Doc Comments +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
      * Convert a v1 device group pattern to sql that can be ingested by jQuery-QueryBuilder
      *
      * @param $pattern
-     * @return array
+     * @return string
      */
     private function convertV1Pattern($pattern)
     {

app/Http/Requests/UpdateUserRequest.php

Indentation +1 added lines, -1 removed lines

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