@@ -45,7 +45,7 @@ public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()
45
45
->method ('setToken ' )
46
46
;
47
47
48
- $ this ->assertNull ($ listener ($ this ->getGetResponseEvent ( )));
48
+ $ this ->assertNull ($ listener (new RequestEvent ( $ this ->createMock (HttpKernelInterface::class), new Request (), HttpKernelInterface:: MASTER_REQUEST )));
49
49
}
50
50
51
51
public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet ()
@@ -64,9 +64,7 @@ public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
64
64
->willReturn (null )
65
65
;
66
66
67
- $ event = $ this ->getGetResponseEvent ();
68
-
69
- $ this ->assertNull ($ listener ($ event ));
67
+ $ this ->assertNull ($ listener (new RequestEvent ($ this ->createMock (HttpKernelInterface::class), new Request (), HttpKernelInterface::MASTER_REQUEST )));
70
68
}
71
69
72
70
public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenticationManagerImplementation ()
@@ -99,9 +97,7 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti
99
97
->willThrowException ($ exception )
100
98
;
101
99
102
- $ event = $ this ->getGetResponseEvent ($ request );
103
-
104
- $ listener ($ event );
100
+ $ listener (new RequestEvent ($ this ->createMock (HttpKernelInterface::class), $ request , HttpKernelInterface::MASTER_REQUEST ));
105
101
}
106
102
107
103
public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation ()
@@ -134,9 +130,7 @@ public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExcepti
134
130
->willThrowException ($ exception )
135
131
;
136
132
137
- $ event = $ this ->getGetResponseEvent ();
138
-
139
- $ listener ($ event );
133
+ $ listener (new RequestEvent ($ this ->createMock (HttpKernelInterface::class), new Request (), HttpKernelInterface::MASTER_REQUEST ));
140
134
}
141
135
142
136
public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggersLoginFail ()
@@ -166,9 +160,7 @@ public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggers
166
160
->method ('authenticate ' )
167
161
;
168
162
169
- $ event = $ this ->getGetResponseEvent ();
170
-
171
- $ listener ($ event );
163
+ $ listener (new RequestEvent ($ this ->createMock (HttpKernelInterface::class), new Request (), HttpKernelInterface::MASTER_REQUEST ));
172
164
}
173
165
174
166
public function testOnCoreSecurity ()
@@ -200,9 +192,7 @@ public function testOnCoreSecurity()
200
192
->willReturn ($ token )
201
193
;
202
194
203
- $ event = $ this ->getGetResponseEvent ();
204
-
205
- $ listener ($ event );
195
+ $ listener (new RequestEvent ($ this ->createMock (HttpKernelInterface::class), new Request (), HttpKernelInterface::MASTER_REQUEST ));
206
196
}
207
197
208
198
public function testSessionStrategy ()
@@ -244,15 +234,13 @@ public function testSessionStrategy()
244
234
$ request = new Request ();
245
235
$ request ->setSession ($ session );
246
236
247
- $ event = $ this ->getGetResponseEvent ($ request );
248
-
249
237
$ sessionStrategy
250
238
->expects ($ this ->once ())
251
239
->method ('onAuthentication ' )
252
240
->willReturn (null )
253
241
;
254
242
255
- $ listener ($ event );
243
+ $ listener (new RequestEvent ( $ this -> createMock (HttpKernelInterface::class), $ request , HttpKernelInterface:: MASTER_REQUEST ) );
256
244
}
257
245
258
246
public function testSessionIsMigratedByDefault ()
@@ -298,9 +286,7 @@ public function testSessionIsMigratedByDefault()
298
286
$ request = new Request ();
299
287
$ request ->setSession ($ session );
300
288
301
- $ event = $ this ->getGetResponseEvent ($ request );
302
-
303
- $ listener ($ event );
289
+ $ listener (new RequestEvent ($ this ->createMock (HttpKernelInterface::class), $ request , HttpKernelInterface::MASTER_REQUEST ));
304
290
}
305
291
306
292
public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherIsPresent ()
@@ -332,8 +318,6 @@ public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherI
332
318
->willReturn ($ token )
333
319
;
334
320
335
- $ event = $ this ->getGetResponseEvent ();
336
-
337
321
$ dispatcher
338
322
->expects ($ this ->once ())
339
323
->method ('dispatch ' )
@@ -343,23 +327,7 @@ public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherI
343
327
)
344
328
;
345
329
346
- $ listener ($ event );
347
- }
348
-
349
- protected function getGetResponseEvent (Request $ request = null ): RequestEvent
350
- {
351
- $ request = $ request ?? new Request ();
352
-
353
- $ event = $ this ->getMockBuilder (RequestEvent::class)
354
- ->setConstructorArgs ([$ this ->createMock (HttpKernelInterface::class), $ request , HttpKernelInterface::MASTER_REQUEST ])
355
- ->getMock ();
356
- $ event
357
- ->expects ($ this ->any ())
358
- ->method ('getRequest ' )
359
- ->willReturn ($ request )
360
- ;
361
-
362
- return $ event ;
330
+ $ listener (new RequestEvent ($ this ->createMock (HttpKernelInterface::class), new Request (), HttpKernelInterface::MASTER_REQUEST ));
363
331
}
364
332
365
333
protected function getListener ($ withDispatcher = false , $ catchExceptions = true , $ withSessionStrategy = false )
0 commit comments