summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2016-11-16 17:17:09 -0500
committerFabien Potencier <fabien.potencier@gmail.com>2016-11-16 17:17:09 -0500
commit943147f230113903c06ea36e567b700d10e28ab3 (patch)
treeb1b8470a88ab155996d96284219fba4ae9d96c55
parentbf1abf4bdba73649099fe14b44352c0e2665a6a5 (diff)
parentc5811a853e7d71055320c9d10e40c49a824f0f54 (diff)
downloadsymfony-security-3.1.7.zip
symfony-security-3.1.7.tar.gz
symfony-security-3.1.7.tar.bz2
Merge branch '2.8' into 3.1v3.1.7
* 2.8: DX: replace @link with @see annotation bumped min version of Twig to 1.28
-rw-r--r--Core/Encoder/BCryptPasswordEncoder.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php
index ddac77a..8278ef3 100644
--- a/Core/Encoder/BCryptPasswordEncoder.php
+++ b/Core/Encoder/BCryptPasswordEncoder.php
@@ -62,7 +62,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
*
* @throws BadCredentialsException when the given password is too long
*
- * @link http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111
+ * @see http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111
*/
public function encodePassword($raw, $salt)
{