From: Kunal Mehta <legoktm@gmail.com>
Date: Tue, 29 Jul 2014 05:15:58 +0000 (-0700)
Subject: Documentation fixes for Password API-related changes
X-Git-Tag: 1.31.0-rc.0~14697^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=2a904107c5ed4a79a2d5c4cc88ee15cb1176b2ca;p=lhc%2Fweb%2Fwiklou.git

Documentation fixes for Password API-related changes

A few @since 1.23 --> 1.24

Change-Id: I55d00ab9c3f9dae96ed804a22f19d713879663fa
Follows-Up: I0a9c972931a0eff0cfb2619cef3ddffd03710285
---

diff --git a/includes/User.php b/includes/User.php
index 73d4959ee5..2aabf24baa 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -4614,10 +4614,10 @@ class User implements IDBAccessObject {
 	 * @param bool|string $salt Optional salt, may be random or the user ID.
 	 *  If unspecified or false, will generate one automatically
 	 * @return string Password hash
-	 * @deprecated since 1.23, use Password class
+	 * @deprecated since 1.24, use Password class
 	 */
 	public static function crypt( $password, $salt = false ) {
-		wfDeprecated( __METHOD__, '1.23' );
+		wfDeprecated( __METHOD__, '1.24' );
 		$hash = self::getPasswordFactory()->newFromPlaintext( $password );
 		return $hash->toString();
 	}
@@ -4631,10 +4631,10 @@ class User implements IDBAccessObject {
 	 * @param string|bool $userId User ID for old-style password salt
 	 *
 	 * @return bool
-	 * @deprecated since 1.23, use Password class
+	 * @deprecated since 1.24, use Password class
 	 */
 	public static function comparePasswords( $hash, $password, $userId = false ) {
-		wfDeprecated( __METHOD__, '1.23' );
+		wfDeprecated( __METHOD__, '1.24' );
 
 		// Check for *really* old password hashes that don't even have a type
 		// The old hash format was just an md5 hex hash, with no type information
diff --git a/includes/password/PasswordFactory.php b/includes/password/PasswordFactory.php
index 7aa78a7e01..70b7656cb0 100644
--- a/includes/password/PasswordFactory.php
+++ b/includes/password/PasswordFactory.php
@@ -29,7 +29,7 @@ final class PasswordFactory {
 	/**
 	 * The default PasswordHash type
 	 *
-*@var string
+	 * @var string
 	 * @see PasswordFactory::setDefaultType
 	 */
 	private $default = '';
diff --git a/tests/phpunit/MediaWikiPasswordTestCase.php b/tests/phpunit/MediaWikiPasswordTestCase.php
index a4cec09938..edf944b47f 100644
--- a/tests/phpunit/MediaWikiPasswordTestCase.php
+++ b/tests/phpunit/MediaWikiPasswordTestCase.php
@@ -21,7 +21,7 @@
  */
 
 /**
- * @since 1.23
+ * @since 1.24
  */
 abstract class MediaWikiPasswordTestCase extends MediaWikiTestCase {
 	/**