Merge pull request #12 from philbates35/person-function-fix

Fix person_fn not being called when session not empty

Author: ArturMoczulski

src/RollbarLogHandler.php

@@ -87,19 +87,33 @@ protected function addContext(array $context = [])
     {
         // Add session data.
         if ($session = $this->app->session->all()) {
+            $config = $this->logger->extend([]);
+
+            if (empty($config['person']) or ! is_array($config['person'])) {
+                $person = [];
+            } else {
+                $person = $config['person'];
+            }
+
             // Merge person context.
             if (isset($context['person']) and is_array($context['person'])) {
-                $this->logger->configure(['person' => $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']);
+                    }
+                }
             }
 
             // Add user session information.
-            $config = $this->logger->extend([]);
-            $person = isset($config['person']) ? $config['person'] : [];
-            
-            $person['session'] = isset($person['session']) ?
-                array_merge($session, $person['session']) :
+            if (isset($person['session'])) {
+                $person['session'] = array_merge($session, $person['session']);
+            } else {
                 $person['session'] = $session;
+            }
 
             // User session id as user id if not set.
             if (! isset($person['id'])) {

tests/RollbarTest.php

@@ -177,4 +177,27 @@ public function testErrorLevels3()
         $this->app->log->alert('hello');
         $this->app->log->emergency('hello');
     }
+
+    public function testPersonFunctionIsCalledWhenSessionContainsAtLeastOneItem()
+    {
+        $this->app->config->set('services.rollbar.person_fn', function () {
+            return [
+                'id' => '123',
+                'username' => 'joebloggs',
+            ];
+        });
+
+        $logger = $this->app->make('Rollbar\RollbarLogger');
+
+        $this->app->session->put('foo', 'bar');
+
+        $this->app->log->debug('hello');
+
+        $config = $logger->extend([]);
+
+        $person = $config['person'];
+
+        $this->assertEquals('123', $person['id']);
+        $this->assertEquals('joebloggs', $person['username']);
+    }
 }