murrant / librenmsv2

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

app/Http/Controllers/UserPortController.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
      * @param AdminOnlyRequest $request
      * @param $user_id
      * @param $port_id
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(AdminOnlyRequest $request, $user_id)
     {
@@ -69,7 +69,7 @@ 
      * @param AdminOnlyRequest $request
      * @param $user_id
      * @param $port_id
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(AdminOnlyRequest $request, $user_id, $port_id)
     {

app/Http/Controllers/UserDeviceController.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
      * @param AdminOnlyRequest $request
      * @param $user_id
      * @param $port_id
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(AdminOnlyRequest $request, $user_id)
     {
@@ -69,7 +69,7 @@ 
      * @param AdminOnlyRequest $request
      * @param $user_id
      * @param $port_id
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(AdminOnlyRequest $request, $user_id, $port_id)
     {

app/Api/Controllers/DashboardWidgetController.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
      */
     public function show(Request $request, $id)
     {
-        $widget  = Widgets::find($id);
+        $widget = Widgets::find($id);
         return array('widget' => $widget);
     }
 

app/Http/Controllers/DeviceController.php

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

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

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

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

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