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

Commit 78724ba

Browse files
committed
Merge branch '2.4' into 2.5
* 2.4: [Validator] Add missing ru translations don't disable constructor calls to mockups of classes that extend internal PHP classes special handling for the JsonDescriptor to work around changes in PHP's JSON pretty printer Conflicts: src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
2 parents 7bfcd83 + b0486bf commit 78724ba

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Core/Tests/Authentication/AuthenticationProviderManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ protected function getAuthenticationProvider($supports, $token = null, $exceptio
129129
} elseif (null !== $exception) {
130130
$provider->expects($this->once())
131131
->method('authenticate')
132-
->will($this->throwException($this->getMock($exception, null, array(), '', true)))
132+
->will($this->throwException($this->getMock($exception, null, array(), '')))
133133
;
134134
}
135135

0 commit comments

Comments
 (0)