@@ -40,7 +40,7 @@ class SecurityDataCollectorTest extends TestCase
4040{
4141 public function testCollectWhenSecurityIsDisabled ()
4242 {
43- $ collector = new SecurityDataCollector (null , null , null , null , null , null , true );
43+ $ collector = new SecurityDataCollector (null , null , null , null , null , null );
4444 $ collector ->collect (new Request (), new Response ());
4545
4646 $ this ->assertSame ('security ' , $ collector ->getName ());
@@ -60,7 +60,7 @@ public function testCollectWhenSecurityIsDisabled()
6060 public function testCollectWhenAuthenticationTokenIsNull ()
6161 {
6262 $ tokenStorage = new TokenStorage ();
63- $ collector = new SecurityDataCollector ($ tokenStorage , $ this ->getRoleHierarchy (), null , null , null , null , true );
63+ $ collector = new SecurityDataCollector ($ tokenStorage , $ this ->getRoleHierarchy (), null , null , null , null );
6464 $ collector ->collect (new Request (), new Response ());
6565
6666 $ this ->assertTrue ($ collector ->isEnabled ());
@@ -82,7 +82,7 @@ public function testCollectAuthenticationTokenAndRoles(array $roles, array $norm
8282 $ tokenStorage = new TokenStorage ();
8383 $ tokenStorage ->setToken (new UsernamePasswordToken (new InMemoryUser ('hhamon ' , 'P4$$w0rD ' , $ roles ), 'provider ' , $ roles ));
8484
85- $ collector = new SecurityDataCollector ($ tokenStorage , $ this ->getRoleHierarchy (), null , null , null , null , true );
85+ $ collector = new SecurityDataCollector ($ tokenStorage , $ this ->getRoleHierarchy (), null , null , null , null );
8686 $ collector ->collect (new Request (), new Response ());
8787 $ collector ->lateCollect ();
8888
@@ -105,7 +105,7 @@ public function testCollectSwitchUserToken()
105105 $ tokenStorage = new TokenStorage ();
106106 $ tokenStorage ->setToken (new SwitchUserToken (new InMemoryUser ('hhamon ' , 'P4$$w0rD ' , ['ROLE_USER ' , 'ROLE_PREVIOUS_ADMIN ' ]), 'provider ' , ['ROLE_USER ' , 'ROLE_PREVIOUS_ADMIN ' ], $ adminToken ));
107107
108- $ collector = new SecurityDataCollector ($ tokenStorage , $ this ->getRoleHierarchy (), null , null , null , null , true );
108+ $ collector = new SecurityDataCollector ($ tokenStorage , $ this ->getRoleHierarchy (), null , null , null , null );
109109 $ collector ->collect (new Request (), new Response ());
110110 $ collector ->lateCollect ();
111111
@@ -135,7 +135,7 @@ public function testGetFirewall()
135135 ->with ($ request )
136136 ->willReturn ($ firewallConfig );
137137
138- $ collector = new SecurityDataCollector (null , null , null , null , $ firewallMap , new TraceableFirewallListener ($ firewallMap , new EventDispatcher (), new LogoutUrlGenerator ()), true );
138+ $ collector = new SecurityDataCollector (null , null , null , null , $ firewallMap , new TraceableFirewallListener ($ firewallMap , new EventDispatcher (), new LogoutUrlGenerator ()));
139139 $ collector ->collect ($ request , new Response ());
140140 $ collector ->lateCollect ();
141141 $ collected = $ collector ->getFirewall ();
@@ -159,7 +159,7 @@ public function testGetFirewallReturnsNull()
159159 $ response = new Response ();
160160
161161 // Don't inject any firewall map
162- $ collector = new SecurityDataCollector (null , null , null , null , null , null , true );
162+ $ collector = new SecurityDataCollector (null , null , null , null , null , null );
163163 $ collector ->collect ($ request , $ response );
164164 $ this ->assertNull ($ collector ->getFirewall ());
165165
@@ -169,7 +169,7 @@ public function testGetFirewallReturnsNull()
169169 ->disableOriginalConstructor ()
170170 ->getMock ();
171171
172- $ collector = new SecurityDataCollector (null , null , null , null , $ firewallMap , new TraceableFirewallListener ($ firewallMap , new EventDispatcher (), new LogoutUrlGenerator ()), true );
172+ $ collector = new SecurityDataCollector (null , null , null , null , $ firewallMap , new TraceableFirewallListener ($ firewallMap , new EventDispatcher (), new LogoutUrlGenerator ()));
173173 $ collector ->collect ($ request , $ response );
174174 $ this ->assertNull ($ collector ->getFirewall ());
175175
@@ -179,7 +179,7 @@ public function testGetFirewallReturnsNull()
179179 ->disableOriginalConstructor ()
180180 ->getMock ();
181181
182- $ collector = new SecurityDataCollector (null , null , null , null , $ firewallMap , new TraceableFirewallListener ($ firewallMap , new EventDispatcher (), new LogoutUrlGenerator ()), true );
182+ $ collector = new SecurityDataCollector (null , null , null , null , $ firewallMap , new TraceableFirewallListener ($ firewallMap , new EventDispatcher (), new LogoutUrlGenerator ()));
183183 $ collector ->collect ($ request , $ response );
184184 $ this ->assertNull ($ collector ->getFirewall ());
185185 }
@@ -213,7 +213,7 @@ public function testGetListeners()
213213 $ firewall = new TraceableFirewallListener ($ firewallMap , new EventDispatcher (), new LogoutUrlGenerator ());
214214 $ firewall ->onKernelRequest ($ event );
215215
216- $ collector = new SecurityDataCollector (null , null , null , null , $ firewallMap , $ firewall, true );
216+ $ collector = new SecurityDataCollector (null , null , null , null , $ firewallMap , $ firewall );
217217 $ collector ->collect ($ request , $ response );
218218
219219 $ this ->assertNotEmpty ($ collected = $ collector ->getListeners ()[0 ]);
@@ -260,7 +260,7 @@ public function dispatch(object $event, ?string $eventName = null): object
260260 ],
261261 ]]);
262262
263- $ dataCollector = new SecurityDataCollector (null , null , null , $ accessDecisionManager , null , null , true );
263+ $ dataCollector = new SecurityDataCollector (null , null , null , $ accessDecisionManager , null , null );
264264
265265 $ dataCollector ->collect (new Request (), new Response ());
266266
@@ -348,7 +348,7 @@ public function dispatch(object $event, ?string $eventName = null): object
348348 ],
349349 ]);
350350
351- $ dataCollector = new SecurityDataCollector (null , null , null , $ accessDecisionManager , null , null , true );
351+ $ dataCollector = new SecurityDataCollector (null , null , null , $ accessDecisionManager , null , null );
352352
353353 $ dataCollector ->collect (new Request (), new Response ());
354354
@@ -420,7 +420,7 @@ public function testGetVotersIfAccessDecisionManagerHasNoVoters()
420420 'voterDetails ' => [],
421421 ]]);
422422
423- $ dataCollector = new SecurityDataCollector (null , null , null , $ accessDecisionManager , null , null , true );
423+ $ dataCollector = new SecurityDataCollector (null , null , null , $ accessDecisionManager , null , null );
424424
425425 $ dataCollector ->collect (new Request (), new Response ());
426426
0 commit comments