Merge pull request #7 from szoper/bugfix/missing-request-id-exception…

…-in-monolog FIX: MonologProcessor handles particular kind of exceptions thrown from RequestIdProviders
php-middleware · Mar 23, 2016 · f29fbac · f29fbac
2 parents 3cd700e + 2837632
commit f29fbac
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/src/MonologProcessor.php b/src/MonologProcessor.php
@@ -2,6 +2,8 @@
 
 namespace PhpMiddleware\RequestId;
 
+use PhpMiddleware\RequestId\Exception\MissingRequestId;
+
 final class MonologProcessor
 {
     const KEY = 'request_id';
@@ -15,7 +17,13 @@ public function __construct(RequestIdProviderInterface $requestIdProvider)
 
     public function __invoke(array $record)
     {
-        $record['extra'][self::KEY] = $this->requestIdProvider->getRequestId();
+        try {
+            $requestId = $this->requestIdProvider->getRequestId();
+        } catch (MissingRequestId $e) {
+            $requestId = null;
+        }
+
+        $record['extra'][self::KEY] = $requestId;
 
         return $record;
     }

diff --git a/test/MonologProcessorTest.php b/test/MonologProcessorTest.php
@@ -2,28 +2,43 @@
 
 namespace PhpMiddlewareTestTest\RequestId;
 
+use PhpMiddleware\RequestId\Exception\MissingRequestId;
 use PhpMiddleware\RequestId\MonologProcessor;
 use PhpMiddleware\RequestId\RequestIdProviderInterface;
 
 class MonologProcessorTest extends \PHPUnit_Framework_TestCase
 {
     protected $processor;
+    /**
+     * @var RequestIdProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestIdProvider;
 
-    protected function setUp()
+    public function testIsRequestIdInRecord()
     {
-        $requestIdProvider = $this->getMock(RequestIdProviderInterface::class);
-        $requestIdProvider->expects($this->once())->method('getRequestId')->willReturn('boo');
+        $this->requestIdProvider->expects($this->once())->method('getRequestId')->willReturn('boo');
+        $record = ['extra' => []];
 
-        $this->processor = new MonologProcessor($requestIdProvider);
+        $newRecord = call_user_func($this->processor, $record);
+
+        $this->assertArrayHasKey(MonologProcessor::KEY, $newRecord['extra']);
+        $this->assertSame('boo', $newRecord['extra'][MonologProcessor::KEY]);
     }
 
-    public function testIsRequestIdInRecord()
+    public function testIsMissingRequestIdExceptionHandledProperly()
     {
+        $this->requestIdProvider->expects($this->once())->method('getRequestId')->willThrowException(new MissingRequestId());
         $record = ['extra' => []];
 
         $newRecord = call_user_func($this->processor, $record);
 
         $this->assertArrayHasKey(MonologProcessor::KEY, $newRecord['extra']);
-        $this->assertSame('boo', $newRecord['extra'][MonologProcessor::KEY]);
+        $this->assertNull($newRecord['extra'][MonologProcessor::KEY]);
+    }
+
+    protected function setUp()
+    {
+        $this->requestIdProvider = $this->getMock(RequestIdProviderInterface::class);
+        $this->processor         = new MonologProcessor($this->requestIdProvider);
     }
 }