Skip to content

Commit 34e545a

Browse files
ste93cryste93cry
committed
Update tests to account for removed HttpKernelInterface::MASTER_REQUEST constant
1 parent 594964e commit 34e545a

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

‎tests/EventListener/ErrorListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function handleExceptionEventDataProvider(): \Generator
6666
new ExceptionEvent(
6767
$this->createMock(HttpKernelInterface::class),
6868
new Request(),
69-
HttpKernelInterface::MASTER_REQUEST,
69+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST,
7070
new \Exception()
7171
),
7272
];

‎tests/EventListener/LoginListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function testHandleKernelRequestEvent(TokenInterface $token, ?UserDataBag
8888
$this->listener->handleKernelRequestEvent(new RequestEvent(
8989
$this->createMock(HttpKernelInterface::class),
9090
new Request(),
91-
HttpKernelInterface::MASTER_REQUEST
91+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
9292
));
9393

9494
$event = $scope->applyToEvent(Event::createEvent());
@@ -273,7 +273,7 @@ public function testHandleKernelRequestEventDoesNothingIfTokenIsNotSet(): void
273273
$this->listener->handleKernelRequestEvent(new RequestEvent(
274274
$this->createMock(HttpKernelInterface::class),
275275
new Request(),
276-
HttpKernelInterface::MASTER_REQUEST
276+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
277277
));
278278
}
279279

‎tests/EventListener/RequestListenerTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function handleKernelRequestEventDataProvider(): \Generator
8282
new RequestEvent(
8383
$this->createMock(HttpKernelInterface::class),
8484
new Request([], [], [], [], [], ['REMOTE_ADDR' => '127.0.0.1']),
85-
HttpKernelInterface::MASTER_REQUEST
85+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
8686
),
8787
$this->getMockedClientWithOptions(new Options(['send_default_pii' => false])),
8888
new UserDataBag(),
@@ -93,7 +93,7 @@ public function handleKernelRequestEventDataProvider(): \Generator
9393
new RequestEvent(
9494
$this->createMock(HttpKernelInterface::class),
9595
new Request(),
96-
HttpKernelInterface::MASTER_REQUEST
96+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
9797
),
9898
$this->getMockedClientWithOptions(new Options(['send_default_pii' => true])),
9999
new UserDataBag(),
@@ -104,7 +104,7 @@ public function handleKernelRequestEventDataProvider(): \Generator
104104
new RequestEvent(
105105
$this->createMock(HttpKernelInterface::class),
106106
new Request([], [], [], [], [], ['REMOTE_ADDR' => '127.0.0.1']),
107-
HttpKernelInterface::MASTER_REQUEST
107+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
108108
),
109109
$this->getMockedClientWithOptions(new Options(['send_default_pii' => true])),
110110
new UserDataBag('foo_user'),
@@ -115,7 +115,7 @@ public function handleKernelRequestEventDataProvider(): \Generator
115115
new RequestEvent(
116116
$this->createMock(HttpKernelInterface::class),
117117
new Request([], [], [], [], [], ['REMOTE_ADDR' => '127.0.0.1']),
118-
HttpKernelInterface::MASTER_REQUEST
118+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
119119
),
120120
$this->getMockedClientWithOptions(new Options(['send_default_pii' => true])),
121121
new UserDataBag('foo_user', null, '::1'),
@@ -168,7 +168,7 @@ static function () {
168168
static function () {
169169
},
170170
new Request(),
171-
HttpKernelInterface::MASTER_REQUEST
171+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
172172
),
173173
[],
174174
];
@@ -179,7 +179,7 @@ static function () {
179179
static function () {
180180
},
181181
new Request([], [], ['_route' => 'homepage']),
182-
HttpKernelInterface::MASTER_REQUEST
182+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
183183
),
184184
[
185185
'route' => 'homepage',

‎tests/EventListener/SubRequestListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function testHandleKernelRequestEvent(RequestEvent $event): void
5353
public function handleKernelRequestEventDataProvider(): \Generator
5454
{
5555
yield [
56-
new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST),
56+
new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST),
5757
];
5858

5959
yield [
@@ -80,7 +80,7 @@ public function testHandleKernelFinishRequestEvent($event): void
8080
public function handleKernelFinishRequestEventDataProvider(): \Generator
8181
{
8282
yield [
83-
new FinishRequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST),
83+
new FinishRequestEvent($this->createMock(HttpKernelInterface::class), new Request(), defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST),
8484
];
8585

8686
yield [

‎tests/EventListener/TracingRequestListenerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function testHandleKernelRequestEvent(Options $options, Request $request,
7878
$this->listener->handleKernelRequestEvent(new RequestEvent(
7979
$this->createMock(HttpKernelInterface::class),
8080
$request,
81-
HttpKernelInterface::MASTER_REQUEST
81+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
8282
));
8383
}
8484

@@ -427,7 +427,7 @@ public function testHandleResponseRequestEvent(): void
427427
$this->listener->handleKernelResponseEvent(new ResponseEvent(
428428
$this->createMock(HttpKernelInterface::class),
429429
new Request(),
430-
HttpKernelInterface::MASTER_REQUEST,
430+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST,
431431
new Response()
432432
));
433433

@@ -444,7 +444,7 @@ public function testHandleResponseRequestEventDoesNothingIfNoTransactionIsSetOnH
444444
$this->listener->handleKernelResponseEvent(new ResponseEvent(
445445
$this->createMock(HttpKernelInterface::class),
446446
new Request(),
447-
HttpKernelInterface::MASTER_REQUEST,
447+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST,
448448
new Response()
449449
));
450450
}

‎tests/EventListener/TracingSubRequestListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testHandleKernelRequestEventDoesNothingIfRequestTypeIsMasterRequ
146146
$this->listener->handleKernelRequestEvent(new RequestEvent(
147147
$this->createMock(HttpKernelInterface::class),
148148
new Request(),
149-
HttpKernelInterface::MASTER_REQUEST
149+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
150150
));
151151
}
152152

@@ -191,7 +191,7 @@ public function testHandleKernelFinishRequestEventDoesNothingIfRequestTypeIsMast
191191
$this->listener->handleKernelFinishRequestEvent(new FinishRequestEvent(
192192
$this->createMock(HttpKernelInterface::class),
193193
new Request(),
194-
HttpKernelInterface::MASTER_REQUEST
194+
defined(HttpKernelInterface::class . '::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST
195195
));
196196
}
197197

0 commit comments

Comments
 (0)