Merge branch '2.8' into 3.1

fabpot · fabpot · commit 943147f23011 · 2016-11-16T17:17:09.000-05:00
* 2.8: DX: replace @link with @see annotation bumped min version of Twig to 1.28
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php
@@ -62,7 +62,7 @@ public function __construct($cost)
      *
      * @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)
     {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function __construct($cost)`
`62`	`62`	`*`
`63`	`63`	`* @throws BadCredentialsException when the given password is too long`
`64`	`64`	`*`
`65`		`- * @link http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111`
	`65`	`+ * @see http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111`
`66`	`66`	`*/`
`67`	`67`	`public function encodePassword($raw, $salt)`
`68`	`68`	`{`