Skip to content

Commit ab2b33e

Browse files
committed
fix tests
1 parent c77729c commit ab2b33e

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/EventSubscriber/SetCookieSubscriber.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ final class SetCookieSubscriber implements EventSubscriberInterface
2626
{
2727
public function onKernelResponse(ResponseEvent $event): void
2828
{
29+
$mainRequest = method_exists($event, 'isMainRequest') ? $event->isMainRequest() : $event->isMasterRequest();
2930
if (
30-
!$event->isMainRequest() ||
31+
!($mainRequest) ||
3132
null === $cookies = ($request = $event->getRequest())->attributes->get('_mercure_authorization_cookies')) {
3233
return;
3334
}

src/Twig/MercureExtension.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ public function mercure($topics = null, array $options = []): string
6666
null === $this->authorization ||
6767
null === $this->requestStack ||
6868
(!isset($options['subscribe']) && !isset($options['publish']) && !isset($options['additionalClaims'])) ||
69-
null === $request = $this->requestStack->getMainRequest()
69+
/* @phpstan-ignore-next-line */
70+
null === $request = method_exists($this->requestStack, 'getMainRequest') ? $this->requestStack->getMainRequest() : $this->requestStack->getMasterRequest()
7071
) {
7172
return $url;
7273
}

tests/EventSubscriber/SetCookieSubscriberTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testOnKernelResponse(): void
3737
$cookies = ['' => Cookie::create('mercureAuthorization')];
3838
$request->attributes->set('_mercure_authorization_cookies', $cookies);
3939
$response = new Response();
40-
$event = new ResponseEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response);
40+
$event = new ResponseEvent($kernel, $request, 1 /*HttpKernelInterface::MAIN_REQUEST*/, $response);
4141

4242
$subscriber->onKernelResponse($event);
4343

0 commit comments

Comments
 (0)