Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit ab8d1dc

Browse files
committed
Merge branch '2.5' into 2.6
* 2.5: [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. [Config] fixes broken unit test on ArrayNode class. fixed CS [Security] Delete old session on auth strategy migrate update required minimum TwigBridge version Very minor grammar fix in error message [Tests] Silenced all deprecations in tests for 2.3 BinaryFileResponse - add missing newline fixed CS add a limit and a test to FlattenExceptionTest. CS: There should be no empty lines following phpdocs [FrameworkBundle] fix cache:clear command [2.3] Docblocks should not be followed by a blank line Fix return phpdoc [PropertyAccess] Added test to verify #5775 is fixed
2 parents 24211b9 + 6b42215 commit ab8d1dc

File tree

4 files changed

+6
-177
lines changed

4 files changed

+6
-177
lines changed

Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php

Lines changed: 0 additions & 175 deletions
This file was deleted.

Http/Session/SessionAuthenticationStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function onAuthentication(Request $request, TokenInterface $token)
4747
return;
4848

4949
case self::MIGRATE:
50-
$request->getSession()->migrate();
50+
$request->getSession()->migrate(true);
5151

5252
return;
5353

Http/Tests/Session/SessionAuthenticationStrategyTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testUnsupportedStrategy()
4040
public function testSessionIsMigrated()
4141
{
4242
$session = $this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface');
43-
$session->expects($this->once())->method('migrate');
43+
$session->expects($this->once())->method('migrate')->with($this->equalTo(true));
4444

4545
$strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::MIGRATE);
4646
$strategy->onAuthentication($this->getRequest($session), $this->getToken());

phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
colors="true"
77
bootstrap="vendor/autoload.php"
88
>
9+
<php>
10+
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11+
<ini name="error_reporting" value="-16385"/>
12+
</php>
913
<testsuites>
1014
<testsuite name="Symfony Security Component Test Suite">
1115
<directory>./Acl/Tests/</directory>

0 commit comments

Comments
 (0)