compatibility for RequestStack; add basic test for SessionRequestProcessor

Author: jwong-dayspring

Logger/SessionRequestProcessor.php

@@ -68,8 +68,8 @@ public function __invoke(array $record)
         $record['http.referer'] = $this->_server['http.referer'];
         $record['http.x_forwarded_for'] = $this->_server['http.x_forwarded_for'];
 
-        if ($this->requestStack->getMasterRequest()) {
-            $request = $this->requestStack->getMasterRequest();
+        if ($this->getMainRequest()) {
+            $request = $this->getMainRequest();
             $context = [
                 'request_uri'      => $request->getUri(),
                 'method'           => $request->getMethod(),
@@ -94,6 +94,20 @@ public function __invoke(array $record)
         return $record;
     }
 
+    /**
+     * Compatibility with Symfony <5.3
+     * @return \Symfony\Component\HttpFoundation\Request|null
+     */
+    protected function getMainRequest()
+    {
+        if (method_exists(RequestStack::class, 'getMainRequest')) {
+            return $this->requestStack->getMainRequest();
+        } else {
+            return $this->requestStack->getMasterRequest();
+        }
+    }
+
+
     protected function clean($array)
     {
         $toReturn = array();

Tests/Logger/SessionRequestProcessorTest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Dayspring\LoggingBundle\Tests\Logger;
+
+use Dayspring\LoggingBundle\Logger\SessionRequestProcessor;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\SessionFactory;
+use Symfony\Component\Routing\Router;
+use function var_dump;
+
+class SessionRequestProcessorTest extends TestCase
+{
+    public function testProcessor()
+    {
+        $session = new Session();
+        $requestStack = new RequestStack();
+        $requestStack->push(Request::create('/', 'GET'));
+        $router = $this->createPartialMock(Router::class, ['matchRequest']);
+        $router->expects($this->once())
+            ->method('matchRequest')
+            ->willReturn(['_route' => 'test']);
+
+        $processor = new SessionRequestProcessor($session, $requestStack, $router);
+
+        $handler = new TestHandler();
+
+        $logger = new Logger('test', [$handler], [$processor]);
+
+        $logger->info('test');
+
+        $records = $handler->getRecords();
+
+        $this->assertCount(1, $records);
+        $record = $records[0];
+        $this->assertEquals('test', $record['context']['route']);
+        $this->assertEquals('test', $record['context']['route_parameters']['_route']);
+    }
+}

composer.json

@@ -14,7 +14,8 @@
     },
     "require-dev": {
         "php": ">=7.4",
-        "phpunit/phpunit": "~8.5.33|^9.0"
+        "phpunit/phpunit": "~8.5.33|^9.0",
+        "monolog/monolog": "^1.22 || ^2.0"
     },
     "authors": [
         {