Merge pull request #213 from franmomu/fix_esi_request

Fix handling ESI request
getsentry · May 16, 2019 · 84cb150 · 84cb150
2 parents dbdc4f1 + 5836618
commit 84cb150
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/EventListener/RequestListener.php b/src/EventListener/RequestListener.php
@@ -88,7 +88,11 @@ public function onKernelController(FilterControllerEvent $event): void
             return;
         }
 
-        $matchedRoute = $event->getRequest()->attributes->get('_route');
+        if (! $event->getRequest()->attributes->has('_route')) {
+            return;
+        }
+
+        $matchedRoute = (string) $event->getRequest()->attributes->get('_route');
 
         Hub::getCurrent()
             ->configureScope(function (Scope $scope) use ($matchedRoute): void {

diff --git a/test/EventListener/RequestListenerTest.php b/test/EventListener/RequestListenerTest.php
@@ -355,6 +355,28 @@ public function testOnKernelControllerAddsRouteTag(): void
         $this->assertSame(['route' => 'sf-route'], $this->currentScope->getTags());
     }
 
+    public function testOnKernelControllerRouteTagIsNotSetIfRequestDoesNotHaveARoute(): void
+    {
+        $this->currentHub->configureScope(Argument::type('callable'))
+            ->shouldNotBeCalled();
+
+        $request = new Request();
+        $event = $this->prophesize(FilterControllerEvent::class);
+
+        $event->isMasterRequest()
+            ->willReturn(true);
+        $event->getRequest()
+            ->willReturn($request);
+
+        $listener = new RequestListener(
+            $this->currentHub->reveal(),
+            $this->prophesize(TokenStorageInterface::class)->reveal(),
+            $this->prophesize(AuthorizationCheckerInterface::class)->reveal()
+        );
+
+        $listener->onKernelController($event->reveal());
+    }
+
     public function testOnKernelRequestUserDataAndTagsAreNotSetInSubRequest(): void
     {
         $this->currentHub->configureScope(Argument::type('callable'))