Completed
Pull Request — develop (#57)
by Tony
06:31
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/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/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/Http/Controllers/NotificationController.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
     /**
45 45
      * Update a notifications status.
46 46
      *
47
-     * @return \Illuminate\Http\Response
47
+     * @return \Illuminate\Http\JsonResponse
48 48
      */
49 49
     public function update($id, $action)
50 50
     {
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     /**
56 56
      * Create a new notification
57 57
      *
58
-     * @return \Illuminate\Http\Response
58
+     * @return \Illuminate\Http\JsonResponse
59 59
      */
60 60
     public function create(Request $request)
61 61
     {
Please login to merge, or discard this patch.
app/Api/Controllers/NotificationController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 
40 40
         $notification = Notification::find($id);
41 41
         $enable = strpos($action, 'un') === false;
42
-        if(!$enable) {
42
+        if (!$enable) {
43 43
             $action = substr($action, 2);
44 44
         }
45 45
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
         $notification = new Notification;
69 69
         $notification->title    = $request->title;
70 70
         $notification->body     = $request->body;
71
-        $notification->checksum = hash('sha512',$request->user()->user_id.'.LOCAL.'.$request->title);
71
+        $notification->checksum = hash('sha512', $request->user()->user_id.'.LOCAL.'.$request->title);
72 72
         $notification->source   = $request->user()->user_id;
73 73
         if ($notification->save())
74 74
         {
Please login to merge, or discard this patch.
app/Models/Notification.php 2 patches
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 
71 71
     public function scopeLimit($query)
72 72
     {
73
-        return $query->select('notifications.*','key', 'users.username');
73
+        return $query->select('notifications.*', 'key', 'users.username');
74 74
     }
75 75
 
76 76
     public function scopeSource($query)
Please login to merge, or discard this patch.
app/Models/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/Settings/DatabaseRepository.php 2 patches
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -32,11 +32,17 @@  discard block
 block discarded – undo
32 32
 {
33 33
     // 'config_name', 'config_value'
34 34
 
35
+    /**
36
+     * @param string $key
37
+     */
35 38
     public function has($key)
36 39
     {
37 40
         return DbConfig::exactKey($key)->exists();
38 41
     }
39 42
 
43
+    /**
44
+     * @param string $key
45
+     */
40 46
     public function get($key, $default = null)
41 47
     {
42 48
         $results = DbConfig::key($key)->get(['config_name', 'config_value']);
@@ -100,6 +106,9 @@  discard block
 block discarded – undo
100 106
         return $ret;
101 107
     }
102 108
 
109
+    /**
110
+     * @param \Illuminate\Database\Eloquent\Collection $objs
111
+     */
103 112
     private function objsToArray($objs)
104 113
     {
105 114
         $ret = array();
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         }
46 46
         elseif (count($results) == 1) {
47 47
             $entry = $results->first();
48
-            if($entry->config_name != $key) { //FIXME: better test
48
+            if ($entry->config_name != $key) { //FIXME: better test
49 49
                 // trim the prefix
50 50
                 $local_key = substr($entry->config_name, strlen($key) + 1);
51 51
                 return [$local_key => $entry->config_value];
Please login to merge, or discard this patch.