Merge branch '6.4' into 7.3

* 6.4: [SecurityBundle] Remove legacy parameter in SecurityDataCollectorTest [Console] Specify types of interactive question choices Prevent duplicate entries in module preloads prefer the public API over reflection in test

Author: nicolas-grekas

Tests/DataCollector/SecurityDataCollectorTest.php

@@ -41,7 +41,7 @@ class SecurityDataCollectorTest extends TestCase
 {
  public function testCollectWhenSecurityIsDisabled()
  {
- $collector = new SecurityDataCollector(null, null, null, null, null, null, true);
+ $collector = new SecurityDataCollector(null, null, null, null, null, null);
  $collector->collect(new Request(), new Response());
 
  $this->assertSame('security', $collector->getName());
@@ -61,7 +61,7 @@ public function testCollectWhenSecurityIsDisabled()
  public function testCollectWhenAuthenticationTokenIsNull()
  {
  $tokenStorage = new TokenStorage();
- $collector = new SecurityDataCollector($tokenStorage, $this->getRoleHierarchy(), null, null, null, null, true);
+ $collector = new SecurityDataCollector($tokenStorage, $this->getRoleHierarchy(), null, null, null, null);
  $collector->collect(new Request(), new Response());
 
  $this->assertTrue($collector->isEnabled());
@@ -83,7 +83,7 @@ public function testCollectAuthenticationTokenAndRoles(array $roles, array $norm
  $tokenStorage = new TokenStorage();
  $tokenStorage->setToken(new UsernamePasswordToken(new InMemoryUser('hhamon', 'P4$$w0rD', $roles), 'provider', $roles));
 
- $collector = new SecurityDataCollector($tokenStorage, $this->getRoleHierarchy(), null, null, null, null, true);
+ $collector = new SecurityDataCollector($tokenStorage, $this->getRoleHierarchy(), null, null, null, null);
  $collector->collect(new Request(), new Response());
  $collector->lateCollect();
 
@@ -106,7 +106,7 @@ public function testCollectSwitchUserToken()
  $tokenStorage = new TokenStorage();
  $tokenStorage->setToken(new SwitchUserToken(new InMemoryUser('hhamon', 'P4$$w0rD', ['ROLE_USER']), 'provider', ['ROLE_USER'], $adminToken));
 
- $collector = new SecurityDataCollector($tokenStorage, $this->getRoleHierarchy(), null, null, null, null, true);
+ $collector = new SecurityDataCollector($tokenStorage, $this->getRoleHierarchy(), null, null, null, null);
  $collector->collect(new Request(), new Response());
  $collector->lateCollect();
 
@@ -136,7 +136,7 @@ public function testGetFirewall()
  ->with($request)
  ->willReturn($firewallConfig);
 
- $collector = new SecurityDataCollector(null, null, null, null, $firewallMap, new TraceableFirewallListener($firewallMap, new EventDispatcher(), new LogoutUrlGenerator()), true);
+ $collector = new SecurityDataCollector(null, null, null, null, $firewallMap, new TraceableFirewallListener($firewallMap, new EventDispatcher(), new LogoutUrlGenerator()));
  $collector->collect($request, new Response());
  $collector->lateCollect();
  $collected = $collector->getFirewall();
@@ -160,7 +160,7 @@ public function testGetFirewallReturnsNull()
  $response = new Response();
 
  // Don't inject any firewall map
- $collector = new SecurityDataCollector(null, null, null, null, null, null, true);
+ $collector = new SecurityDataCollector(null, null, null, null, null, null);
  $collector->collect($request, $response);
  $this->assertNull($collector->getFirewall());
 
@@ -170,7 +170,7 @@ public function testGetFirewallReturnsNull()
  ->disableOriginalConstructor()
  ->getMock();
 
- $collector = new SecurityDataCollector(null, null, null, null, $firewallMap, new TraceableFirewallListener($firewallMap, new EventDispatcher(), new LogoutUrlGenerator()), true);
+ $collector = new SecurityDataCollector(null, null, null, null, $firewallMap, new TraceableFirewallListener($firewallMap, new EventDispatcher(), new LogoutUrlGenerator()));
  $collector->collect($request, $response);
  $this->assertNull($collector->getFirewall());
 
@@ -180,7 +180,7 @@ public function testGetFirewallReturnsNull()
  ->disableOriginalConstructor()
  ->getMock();
 
- $collector = new SecurityDataCollector(null, null, null, null, $firewallMap, new TraceableFirewallListener($firewallMap, new EventDispatcher(), new LogoutUrlGenerator()), true);
+ $collector = new SecurityDataCollector(null, null, null, null, $firewallMap, new TraceableFirewallListener($firewallMap, new EventDispatcher(), new LogoutUrlGenerator()));
  $collector->collect($request, $response);
  $this->assertNull($collector->getFirewall());
  }
@@ -214,7 +214,7 @@ public function testGetListeners()
  $firewall = new TraceableFirewallListener($firewallMap, new EventDispatcher(), new LogoutUrlGenerator());
  $firewall->onKernelRequest($event);
 
- $collector = new SecurityDataCollector(null, null, null, null, $firewallMap, $firewall, true);
+ $collector = new SecurityDataCollector(null, null, null, null, $firewallMap, $firewall);
  $collector->collect($request, $response);
 
  $this->assertNotEmpty($collected = $collector->getListeners()[0]);
@@ -261,7 +261,7 @@ public function dispatch(object $event, ?string $eventName = null): object
  ],
  ]]);
 
- $dataCollector = new SecurityDataCollector(null, null, null, $accessDecisionManager, null, null, true);
+ $dataCollector = new SecurityDataCollector(null, null, null, $accessDecisionManager, null, null);
 
  $dataCollector->collect(new Request(), new Response());
 
@@ -349,7 +349,7 @@ public function dispatch(object $event, ?string $eventName = null): object
  ],
  ]);
 
- $dataCollector = new SecurityDataCollector(null, null, null, $accessDecisionManager, null, null, true);
+ $dataCollector = new SecurityDataCollector(null, null, null, $accessDecisionManager, null, null);
 
  $dataCollector->collect(new Request(), new Response());
 
@@ -421,7 +421,7 @@ public function testGetVotersIfAccessDecisionManagerHasNoVoters()
  'voterDetails' => [],
  ]]);
 
- $dataCollector = new SecurityDataCollector(null, null, null, $accessDecisionManager, null, null, true);
+ $dataCollector = new SecurityDataCollector(null, null, null, $accessDecisionManager, null, null);
 
  $dataCollector->collect(new Request(), new Response());