diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.2

Browse Source 
* 3.4:
  Fix typo in translation
  Declare exceptions that are already thrown by implementations
This commit is contained in:
Nicolas Grekas 2019-02-01 11:47:37 +01:00
commit d44fba1260
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php
View File

@ -11,6 +11,8 @@
namespace Symfony\Component\Security\Core\Encoder; namespace Symfony\Component\Security\Core\Encoder;
use Symfony\Component\Security\Core\Exception\BadCredentialsException;
/** /**
* PasswordEncoderInterface is the interface for all encoders. * PasswordEncoderInterface is the interface for all encoders.
* *
@ -25,6 +27,9 @@ interface PasswordEncoderInterface
* @param string $salt The salt * @param string $salt The salt
* *
* @return string The encoded password * @return string The encoded password
*
* @throws BadCredentialsException If the raw password is invalid, e.g. excessively long
* @throws \InvalidArgumentException If the salt is invalid
*/ */
public function encodePassword($raw, $salt); public function encodePassword($raw, $salt);
@ -36,6 +41,8 @@ interface PasswordEncoderInterface
* @param string $salt The salt * @param string $salt The salt
* *
* @return bool true if the password is valid, false otherwise * @return bool true if the password is valid, false otherwise
*
* @throws \InvalidArgumentException If the salt is invalid
*/ */
public function isPasswordValid($encoded, $raw, $salt); public function isPasswordValid($encoded, $raw, $salt);
} }

2
src/Symfony/Component/Security/Core/Resources/translations/security.nb.xlf
View File

@ -16,7 +16,7 @@
</trans-unit> </trans-unit>
<trans-unit id="4"> <trans-unit id="4">
<source>Invalid credentials.</source> <source>Invalid credentials.</source>
<target>Ugyldig påloggingsinformasjonen.</target> <target>Ugyldig påloggingsinformasjon.</target>
</trans-unit> </trans-unit>
<trans-unit id="5"> <trans-unit id="5">
<source>Cookie has already been used by someone else.</source> <source>Cookie has already been used by someone else.</source>

2
src/Symfony/Component/Security/Core/Resources/translations/security.no.xlf
View File

@ -16,7 +16,7 @@
</trans-unit> </trans-unit>
<trans-unit id="4"> <trans-unit id="4">
<source>Invalid credentials.</source> <source>Invalid credentials.</source>
<target>Ugyldig påloggingsinformasjonen.</target> <target>Ugyldig påloggingsinformasjon.</target>
</trans-unit> </trans-unit>
<trans-unit id="5"> <trans-unit id="5">
<source>Cookie has already been used by someone else.</source> <source>Cookie has already been used by someone else.</source>