Skip to content

Commit e93ee6e

Browse files
Merge branch '3.4' into 4.3
* 3.4: #30432 fix an error message fix paths to detect code owners [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4 Remove unused local variables in tests Make sure to collect child forms created on *_SET_DATA events do not render errors for checkboxes twice
2 parents b91b6d4 + 8b123e7 commit e93ee6e

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

Tests/Firewall/LogoutListenerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class LogoutListenerTest extends TestCase
2121
{
2222
public function testHandleUnmatchedPath()
2323
{
24-
list($listener, $tokenStorage, $httpUtils, $options) = $this->getListener();
24+
list($listener, , $httpUtils, $options) = $this->getListener();
2525

2626
list($event, $request) = $this->getGetResponseEvent();
2727

@@ -131,7 +131,7 @@ public function testSuccessHandlerReturnsNonResponse()
131131
$this->expectException('RuntimeException');
132132
$successHandler = $this->getSuccessHandler();
133133

134-
list($listener, $tokenStorage, $httpUtils, $options) = $this->getListener($successHandler);
134+
list($listener, , $httpUtils, $options) = $this->getListener($successHandler);
135135

136136
list($event, $request) = $this->getGetResponseEvent();
137137

@@ -153,7 +153,7 @@ public function testCsrfValidationFails()
153153
$this->expectException('Symfony\Component\Security\Core\Exception\LogoutException');
154154
$tokenManager = $this->getTokenManager();
155155

156-
list($listener, $tokenStorage, $httpUtils, $options) = $this->getListener(null, $tokenManager);
156+
list($listener, , $httpUtils, $options) = $this->getListener(null, $tokenManager);
157157

158158
list($event, $request) = $this->getGetResponseEvent();
159159

Tests/Firewall/RememberMeListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public function testOnCoreSecurity()
224224

225225
public function testSessionStrategy()
226226
{
227-
list($listener, $tokenStorage, $service, $manager, , $dispatcher, $sessionStrategy) = $this->getListener(false, true, true);
227+
list($listener, $tokenStorage, $service, $manager, , , $sessionStrategy) = $this->getListener(false, true, true);
228228

229229
$tokenStorage
230230
->expects($this->once())
@@ -289,7 +289,7 @@ public function testSessionStrategy()
289289

290290
public function testSessionIsMigratedByDefault()
291291
{
292-
list($listener, $tokenStorage, $service, $manager, , $dispatcher, $sessionStrategy) = $this->getListener(false, true, false);
292+
list($listener, $tokenStorage, $service, $manager) = $this->getListener(false, true, false);
293293

294294
$tokenStorage
295295
->expects($this->once())

Tests/Firewall/RemoteUserAuthenticationListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testGetPreAuthenticatedDataNoUser()
6060
$method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
6161
$method->setAccessible(true);
6262

63-
$result = $method->invokeArgs($listener, [$request]);
63+
$method->invokeArgs($listener, [$request]);
6464
}
6565

6666
public function testGetPreAuthenticatedDataWithDifferentKeys()

Tests/Firewall/X509AuthenticationListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function testGetPreAuthenticatedDataNoData()
9898
$method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
9999
$method->setAccessible(true);
100100

101-
$result = $method->invokeArgs($listener, [$request]);
101+
$method->invokeArgs($listener, [$request]);
102102
}
103103

104104
public function testGetPreAuthenticatedDataWithDifferentKeys()

Tests/RememberMe/ResponseListenerTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ public function testRememberMeCookieIsNotSendWithResponse()
6666

6767
public function testItSubscribesToTheOnKernelResponseEvent()
6868
{
69-
$listener = new ResponseListener();
70-
7169
$this->assertSame([KernelEvents::RESPONSE => 'onKernelResponse'], ResponseListener::getSubscribedEvents());
7270
}
7371

0 commit comments

Comments
 (0)