Completed
Pull Request — develop (#44)
by Daniel
07:16
created
app/Providers/RouteServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
      */
38 38
     public function map(Router $router)
39 39
     {
40
-        $router->group(['namespace' => $this->namespace], function ($router) {
40
+        $router->group(['namespace' => $this->namespace], function($router) {
41 41
             require app_path('Http/routes.php');
42 42
         });
43 43
     }
Please login to merge, or discard this patch.
app/User.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     /**
32 32
      * Test if the User is an admin or demo.
33 33
      *
34
-     * @return \Illuminate\Database\Eloquent\Builder
34
+     * @return boolean
35 35
      */
36 36
     public function isAdmin()
37 37
     {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      * Test if this user has global read access
43 43
      * these users have a level of 5, 10 or 11 (demo).
44 44
      *
45
-     * @return \Illuminate\Database\Eloquent\Builder
45
+     * @return boolean
46 46
      */
47 47
     public function hasGlobalRead()
48 48
     {
Please login to merge, or discard this patch.
app/Api/Controllers/DeviceController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
         }
68 68
         else {
69 69
             $user = User::find($request->user()->user_id);
70
-            $device =  $user->devices()->find($id);
70
+            $device = $user->devices()->find($id);
71 71
         }
72 72
         // morph the data as required
73 73
         if ($request->query('displayFormat') == 'link') {
Please login to merge, or discard this patch.
app/Notification.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,11 +41,11 @@
 block discarded – undo
41 41
 
42 42
     public function scopeLimit($query)
43 43
     {
44
-        return $query->select('notifications.*','key');
44
+        return $query->select('notifications.*', 'key');
45 45
     }
46 46
 
47 47
     public function users() {
48
-        return $this->belongsToMany('App\User')->withPivot('notifications_id','user_id');
48
+        return $this->belongsToMany('App\User')->withPivot('notifications_id', 'user_id');
49 49
     }
50 50
 
51 51
 }
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -42,6 +42,9 @@
 block discarded – undo
42 42
         $this->setAttrib('sticky', $enabled);
43 43
     }
44 44
 
45
+    /**
46
+     * @param string $name
47
+     */
45 48
     private function setAttrib($name, $enabled) {
46 49
         if ($enabled === true) {
47 50
             $read = new NotificationAttrib;
Please login to merge, or discard this patch.
app/Api/Controllers/NotificationController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
 
39 39
         $notification = Notification::find($id);
40 40
         $enable = strpos($action, 'un') === false;
41
-        if(!$enable) {
41
+        if (!$enable) {
42 42
             $action = substr($action, 2);
43 43
         }
44 44
 
Please login to merge, or discard this patch.
app/Api/Transformers/PortTransformer.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
     /**
36 36
      * Include Device
37 37
      *
38
-     * @return League\Fractal\ItemResource
38
+     * @return Fractal\Resource\Item
39 39
      */
40 40
     public function includeDevice(Port $port)
41 41
     {
Please login to merge, or discard this patch.
app/Api/Controllers/APIController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
         $stats['ports']      = \App\Port::all()->count();
36 36
         $stats['syslog']     = \App\Syslog::all()->count();
37 37
         $stats['eventlog']   = \App\Eventlog::all()->count();
38
-        $stats['apps']       = DB::table('applications')->count();;
38
+        $stats['apps']       = DB::table('applications')->count(); ;
39 39
         $stats['services']   = DB::table('services')->count();
40 40
         $stats['storage']    = DB::table('storage')->count();
41 41
         $stats['diskio']     = DB::table('ucd_diskio')->count();
Please login to merge, or discard this patch.
app/DeviceOS.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 
6 6
     /**
7 7
      * Load OS Class
8
-     * @param string $os Operating System Identifier
9 8
      * @return DeviceOS
10 9
      */
11 10
     static public function load(Device $device) {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
      */
11 11
     static public function load(Device $device) {
12 12
         $class = 'App\\OS\\'.ucfirst(strtolower($device->os));
13
-        if( class_exists($class) ) {
13
+        if (class_exists($class)) {
14 14
             return new $class($device);
15 15
         }
16 16
         return false; //FIXME: Raise Exception
Please login to merge, or discard this patch.
app/Device.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
      */
79 79
     public function logo() {
80 80
         $os = DeviceOS::load($this);
81
-        if( isset($os->icon) ){
81
+        if (isset($os->icon)) {
82 82
             return asset('images/os/'.$os->icon.'.png');
83 83
         }
84 84
         return asset('images/os/generic.png');
Please login to merge, or discard this patch.