murrant / librenmsv2

app/Api/Controllers/NotificationController.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Api\Controllers;
 
 use App\Models\Notification;
-use App\Models\NotificationAttrib;
-use App\Models\User;
 use Dingo\Api\Http;
 use Dingo\Api\Routing\Helpers;
 use Illuminate\Http\Request;

Indentation +2 added lines, -2 removed lines

@@ -44,10 +44,10 @@
         }
 
         if ($action == 'read') {
-           $result = $notification->markRead($enable);
+            $result = $notification->markRead($enable);
         }
         elseif ($action == 'sticky') {
-           $result = $notification->markSticky(false);
+            $result = $notification->markSticky(false);
         }
 
         if ($result === false) {

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 
         $notification = Notification::find($id);
         $enable = strpos($action, 'un') === false;
-        if(!$enable) {
+        if (!$enable) {
             $action = substr($action, 2);
         }
 
@@ -68,7 +68,7 @@ 
         $notification = new Notification;
         $notification->title    = $request->title;
         $notification->body     = $request->body;
-        $notification->checksum = hash('sha512',$request->user()->user_id.'.LOCAL.'.$request->title);
+        $notification->checksum = hash('sha512', $request->user()->user_id . '.LOCAL.' . $request->title);
         $notification->source   = $request->user()->user_id;
         if ($notification->save())
         {

Braces +4 added lines, -8 removed lines

@@ -27,8 +27,7 @@ 
         if ($type === 'archive')
         {
             $notifications = Notification::IsArchived($request)->get();
-        }
-        else {
+        } else {
             $notifications = Notification::IsUnread()->get();
         }
         return $notifications;
@@ -45,15 +44,13 @@ 
 
         if ($action == 'read') {
            $result = $notification->markRead($enable);
-        }
-        elseif ($action == 'sticky') {
+        } elseif ($action == 'sticky') {
            $result = $notification->markSticky(false);
         }
 
         if ($result === false) {
             return $this->response->errorInternal();
-        }
-        else {
+        } else {
             return $this->response->array(array('statusText' => 'OK'));
         }
     }
@@ -73,8 +70,7 @@ 
         if ($notification->save())
         {
             return $this->response->array(array('statusText' => 'OK'));
-        }
-        else {
+        } else {
             return $this->response->errorInternal();
         }
     }

app/Api/Transformers/PortTransformer.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Include Device
      *
-     * @return League\Fractal\ItemResource
+     * @return Fractal\Resource\Item
      */
     public function includeDevice(Port $port)
     {

app/Http/Controllers/NotificationController.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)
     {

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     public function index($type = null)
     {
 
-        $notifications = $this->api->be(auth()->user())->get('/api/notifications/'.$type);
+        $notifications = $this->api->be(auth()->user())->get('/api/notifications/' . $type);
         if ($type === 'archive')
         {
             $page   = '';
@@ -49,7 +49,7 @@ 
     public function update($id, $action)
     {
 
-        return response()->json($this->api->be(auth()->user())->patch('/api/notifications/'.$id.'/'.$action));
+        return response()->json($this->api->be(auth()->user())->patch('/api/notifications/' . $id . '/' . $action));
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
             $page   = '';
             $button = 'Notifications';
             $bg     = 'maroon';
-        }
-        else {
+        } else {
             $page   = 'archive';
             $button = 'Archive';
             $bg     = 'blue';

app/Http/Controllers/SettingsController.php

Unused Use Statements -2 removed lines

@@ -25,8 +25,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests;
-use App\Models\DbConfig;
 use Illuminate\Http\Request;
 use Input;
 use Settings;

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         $type = Input::get('type');
         if ($type == 'settings-value' || $type == 'settings-array') {
             $key = Input::get('key');
-            if(Settings::isReadOnly($key)) {
+            if (Settings::isReadOnly($key)) {
                 return response('Read only setting', 422);
             }
             Settings::set($key, Input::get('value'));

app/Models/Notification.php

Doc Comments +3 added lines

@@ -42,6 +42,9 @@
         $this->setAttrib('sticky', $enabled);
     }
 
+    /**
+     * @param string $name
+     */
     private function setAttrib($name, $enabled) {
         if ($enabled === true) {
             $read = new NotificationAttrib;

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
     public function scopeLimit($query)
     {
-        return $query->select('notifications.*','key', 'users.username');
+        return $query->select('notifications.*', 'key', 'users.username');
     }
 
     public function scopeSource($query)

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
             $read->value            = 1;
 
             return $this->attribs()->save($read);
-        }
-        else {
+        } else {
             return $this->attribs()->where('key', $name)->delete();
         }
     }

app/Models/User.php

Doc Comments +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     /**
      * Test if the User is an admin or demo.
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return boolean
      */
     public function isAdmin()
     {
@@ -42,7 +42,7 @@ 
      * Test if this user has global read access
      * these users have a level of 5, 10 or 11 (demo).
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return boolean
      */
     public function hasGlobalRead()
     {

app/Settings.php

Doc Comments +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
      * Clear the settings cache.
      * If path is set, only clear the path and it's parents.
      *
-     * @param null $key The path to clear.
+     * @param string $key The path to clear.
      */
     public function flush($key = null)
     {

Indentation +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /**
- * Settings.php
- *
- * @package    LibreNMS
- * @author     Tony Murray <murraytony@gmail.com>
- * @copyright  2016 Tony Murray
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
- */
+     * Settings.php
+     *
+     * @package    LibreNMS
+     * @author     Tony Murray <murraytony@gmail.com>
+     * @copyright  2016 Tony Murray
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
+     */
 namespace App;
 
 

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
     public function get($key, $default = null)
     {
         // return value from cache or fetch it and return it
-        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function () use ($key, $default) {
+        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function() use ($key, $default) {
             // fetch the value from config.php first
             if (Config::has('config.' . $key)) {
                 $config_data = Config::get('config.' . $key, $default);

Braces +6 added lines, -12 removed lines

@@ -70,19 +70,16 @@ 
                     if (is_string($k) && !str_contains($k, '.') && DbConfig::exactKey($key)->exists() && DbConfig::key($key)->count() == 1) {
                         // check that we aren't trying to set an array onto an existing value only setting
                         throw new \Exception("Attempting to set array value to existing non-array value at the key '" . $key . "'");
-                    }
-                    else {
+                    } else {
                         // we are not at the leaf yet, add this chunk to the key and recurse
                         $this->set($key . '.' . $k, $v);
                     }
-                }
-                else {
+                } else {
                     // a leaf, recurse one last time
                     $this->set($k, $v);
                 }
             }
-        }
-        else {
+        } else {
             // make sure we can save this
             if ($this->isReadOnly($key)) {
                 throw new \Exception("The setting '" . $key . "' is read only");
@@ -122,16 +119,14 @@ 
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
                 // return a value if we are getting one item
                 return $db_data->first()->config_value;
-            }
-            elseif (count($db_data) >= 1) {
+            } elseif (count($db_data) >= 1) {
                 // convert the collection to an array
                 $result = self::collectionToArray($db_data, $key);
 
                 // if we have config_data, merge them
                 if (isset($config_data)) {
                     return array_replace_recursive($result, $config_data);
-                }
-                else {
+                } else {
                     return $result;
                 }
             }
@@ -227,8 +222,7 @@ 
         if (is_null($key)) {
             // Clear all cache
             Cache::tags(self::$cache_tag)->flush();
-        }
-        else {
+        } else {
             // Clear specific path
             $path = [];
             foreach (explode('.', $key) as $element) {

app/Facades/Settings.php

Indentation +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /**
- * Settings.php
- *
- * @package    LibreNMS
- * @author     Tony Murray <murraytony@gmail.com>
- * @copyright  2016 Tony Murray
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
- */
+     * Settings.php
+     *
+     * @package    LibreNMS
+     * @author     Tony Murray <murraytony@gmail.com>
+     * @copyright  2016 Tony Murray
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
+     */
 namespace App\Facades;
 use Illuminate\Support\Facades\Facade;
 

app/Api/Controllers/PortController.php

Braces +2 added lines, -4 removed lines

@@ -26,8 +26,7 @@ 
     {
         if (Auth::user()->hasGlobalRead()) {
             $ports = Port::all();
-        }
-        else {
+        } else {
             $ports = Auth::user()->ports()->get();
         }
 
@@ -70,8 +69,7 @@ 
     {
         if ($request->user()->hasGlobalRead()) {
             return Port::find($id);
-        }
-        else {
+        } else {
             $user = User::find($request->user()->user_id);
             return $user->ports()->find($id);
         }