#73: reproduce changes from PR 75 for the laravel-5.5 branch

Author: ArturMoczulski

src/RollbarLogHandler.php

@@ -104,13 +104,24 @@ protected function addContext(array $context = [])
             if (isset($context['person']) and is_array($context['person'])) {
                 $person = $context['person'];
                 unset($context['person']);
-            } else {
-                if (isset($config['person_fn']) && is_callable($config['person_fn'])) {
-                    $data = @call_user_func($config['person_fn']);
-                    if (isset($data['id'])) {
-                        $person = call_user_func($config['person_fn']);
+            } elseif (isset($config['person_fn']) && is_callable($config['person_fn'])) {
+                $data = @call_user_func($config['person_fn']);
+                if (! empty($data)) {
+                    if (is_object($data)) {
+                        if (isset($data->id)) {
+                            $person['id'] = $data->id;
+                            if (isset($data->username)) {
+                                $person['username'] = $data->username;
+                            }
+                            if (isset($data->email)) {
+                                $person['email'] = $data->email;
+                            }
+                        }
+                    } elseif (is_array($data) && isset($data['id'])) {
+                        $person = $data;
                     }
                 }
+                unset($data);
             }
 
             // Add user session information.