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

minor #31813 fix type hint for salt in PasswordEncoderInterface (garak)

Browse Source 
This PR was squashed before being merged into the 3.4 branch (closes #31813).

Discussion
----------

fix type hint for salt in PasswordEncoderInterface

See issue #31812

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #31812
| License       | MIT
| Doc PR        | none

Pretty self-explanatory

Commits
-------

0e741f9600 fix type hint for salt in PasswordEncoderInterface
This commit is contained in:
Nicolas Grekas 2019-06-03 21:38:32 +02:00
commit 0797ef28ed
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
View File

@ -49,7 +49,7 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
* Merges a password and a salt.
*
* @param string $password The password to be used
* @param string $salt The salt to be used
* @param string|null $salt The salt to be used
*
* @return string a merged password and salt
*

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

@ -24,7 +24,7 @@ interface PasswordEncoderInterface
* Encodes the raw password.
*
* @param string $raw The password to encode
* @param string $salt The salt
* @param string|null $salt The salt
*
* @return string The encoded password
*
@ -38,7 +38,7 @@ interface PasswordEncoderInterface
*
* @param string $encoded An encoded password
* @param string $raw A raw password
* @param string $salt The salt
* @param string|null $salt The salt
*
* @return bool true if the password is valid, false otherwise
*