diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-10-18 23:16:19 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-10-18 23:16:19 +0200 |
| commit | c8eee73f855b1c1b0af8f6292c7f291866d06b21 (patch) | |
| tree | e776fb8129d2ef01283eae364a9b4d60d31a9a57 | |
| parent | 88b94c5692a5f003359956a94a868aca91908a65 (diff) | |
| parent | 811f0d2d71571ac24fb55b97c9177515cbb862cb (diff) | |
| download | symfony-security-c8eee73f855b1c1b0af8f6292c7f291866d06b21.zip symfony-security-c8eee73f855b1c1b0af8f6292c7f291866d06b21.tar.gz symfony-security-c8eee73f855b1c1b0af8f6292c7f291866d06b21.tar.bz2 | |
Merge branch '2.1'
* 2.1: (28 commits)
Delete use of CreationExeption
[Form] Fixed error message in PropertyPath to not advice to use a non-existing feature
[Form] Fixed creation of multiple money fields with different currencies
[Form] Fixed setting the "data" option to an object in "choice" and "entity" type
Fixed Serbian plural translations.
Fixed IPv6 Check in RequestMatcher
Fix typo
change what I think is a typo
[Console] Fix error when mode is not in PATH
[WebProfilerBundle] fixed macro usage (to be forward compatible with Twig 2.x)
Change monolog require-dev to use the branch alias instead of dev-master
[FrameworkBundle] partially reverted previous merge
[2.1] Added missing error return codes in commands
Made the router lazy when setting the context
[WebProfilerBundle] fixed typos
Fix incorrect variable in FileProfilerStorage
UnitTest fix
UnitTest fix
added a unit test
fixed #5384
...
| -rw-r--r-- | Core/Encoder/EncoderFactoryInterface.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Encoder/EncoderFactoryInterface.php b/Core/Encoder/EncoderFactoryInterface.php index f6b4a25..2b9834b 100644 --- a/Core/Encoder/EncoderFactoryInterface.php +++ b/Core/Encoder/EncoderFactoryInterface.php @@ -23,7 +23,7 @@ interface EncoderFactoryInterface /** * Returns the password encoder to use for the given account. * - * @param UserInterface|string $user A UserInterface instance of a class name + * @param UserInterface|string $user A UserInterface instance or a class name * * @return PasswordEncoderInterface * |