X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fuser%2FUser.php;h=08f054d286c5e32a9d65fa4b2e03c88272a6fa54;hb=51690a5c79cc2ad8ee35ef8f728ccb1b70298ce1;hp=7bf6be508ad1024cdb037695184c81846724500a;hpb=081f44fa7ff52ba63d1c48eb833dcc110dd1bb30;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/user/User.php b/includes/user/User.php
index 7bf6be508a..08f054d286 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -302,7 +302,7 @@ class User implements IDBAccessObject {
 	/** @var Block */
 	private $mBlockedFromCreateAccount = false;
 
-	/** @var integer User::READ_* constant bitfield used to load data */
+	/** @var int User::READ_* constant bitfield used to load data */
 	protected $queryFlagsUsed = self::READ_NORMAL;
 
 	public static $idCacheByName = [];
@@ -357,7 +357,7 @@ class User implements IDBAccessObject {
 	/**
 	 * Load the user table data for this object from the source given by mFrom.
 	 *
-	 * @param integer $flags User::READ_* constant bitfield
+	 * @param int $flags User::READ_* constant bitfield
 	 */
 	public function load( $flags = self::READ_NORMAL ) {
 		global $wgFullyInitialised;
@@ -419,7 +419,7 @@ class User implements IDBAccessObject {
 
 	/**
 	 * Load user table data, given mId has already been set.
-	 * @param integer $flags User::READ_* constant bitfield
+	 * @param int $flags User::READ_* constant bitfield
 	 * @return bool False if the ID does not exist, true otherwise
 	 */
 	public function loadFromId( $flags = self::READ_NORMAL ) {
@@ -450,7 +450,7 @@ class User implements IDBAccessObject {
 	/**
 	 * @since 1.27
 	 * @param string $wikiId
-	 * @param integer $userId
+	 * @param int $userId
 	 */
 	public static function purge( $wikiId, $userId ) {
 		$cache = ObjectCache::getMainWANInstance();
@@ -603,7 +603,7 @@ class User implements IDBAccessObject {
 			]
 		);
 
-		return $id ? User::newFromId( $id ) : null;
+		return $id ? self::newFromId( $id ) : null;
 	}
 
 	/**
@@ -759,7 +759,7 @@ class User implements IDBAccessObject {
 	/**
 	 * Get database id given a user name
 	 * @param string $name Username
-	 * @param integer $flags User::READ_* constant bitfield
+	 * @param int $flags User::READ_* constant bitfield
 	 * @return int|null The corresponding user's ID, or null if user is nonexistent
 	 */
 	public static function idFromName( $name, $flags = self::READ_NORMAL ) {
@@ -842,7 +842,7 @@ class User implements IDBAccessObject {
 		global $wgContLang, $wgMaxNameChars;
 
 		if ( $name == ''
-			|| User::isIP( $name )
+			|| self::isIP( $name )
 			|| strpos( $name, '/' ) !== false
 			|| strlen( $name ) > $wgMaxNameChars
 			|| $name != $wgContLang->ucfirst( $name )
@@ -1109,17 +1109,17 @@ class User implements IDBAccessObject {
 			case false:
 				break;
 			case 'valid':
-				if ( !User::isValidUserName( $name ) ) {
+				if ( !self::isValidUserName( $name ) ) {
 					$name = false;
 				}
 				break;
 			case 'usable':
-				if ( !User::isUsableName( $name ) ) {
+				if ( !self::isUsableName( $name ) ) {
 					$name = false;
 				}
 				break;
 			case 'creatable':
-				if ( !User::isCreatableName( $name ) ) {
+				if ( !self::isCreatableName( $name ) ) {
 					$name = false;
 				}
 				break;
@@ -1252,7 +1252,7 @@ class User implements IDBAccessObject {
 	 * Load user and user_group data from the database.
 	 * $this->mId must be set, this is how the user is identified.
 	 *
-	 * @param integer $flags User::READ_* constant bitfield
+	 * @param int $flags User::READ_* constant bitfield
 	 * @return bool True if the user exists, false if the user is anonymous
 	 */
 	public function loadFromDatabase( $flags = self::READ_LATEST ) {
@@ -1591,7 +1591,7 @@ class User implements IDBAccessObject {
 		// since extensions may change the set of searchable namespaces depending
 		// on user groups/permissions.
 		foreach ( $wgNamespacesToBeSearchedDefault as $nsnum => $val ) {
-			$defOpt['searchNs' . $nsnum] = (boolean)$val;
+			$defOpt['searchNs' . $nsnum] = (bool)$val;
 		}
 		$defOpt['skin'] = Skin::normalizeKey( $wgDefaultSkin );
 
@@ -2212,7 +2212,7 @@ class User implements IDBAccessObject {
 	 * @return int The user's ID; 0 if the user is anonymous or nonexistent
 	 */
 	public function getId() {
-		if ( $this->mId === null && $this->mName !== null && User::isIP( $this->mName ) ) {
+		if ( $this->mId === null && $this->mName !== null && self::isIP( $this->mName ) ) {
 			// Special case, we know the user is anonymous
 			return 0;
 		} elseif ( !$this->isItemLoaded( 'id' ) ) {
@@ -3519,7 +3519,7 @@ class User implements IDBAccessObject {
 	/**
 	 * Check if user is allowed to access a feature / make an action
 	 *
-	 * @param string ... Permissions to test
+	 * @param string $permissions,... Permissions to test
 	 * @return bool True if user is allowed to perform *any* of the given actions
 	 */
 	public function isAllowedAny() {
@@ -3534,7 +3534,7 @@ class User implements IDBAccessObject {
 
 	/**
 	 *
-	 * @param string ... Permissions to test
+	 * @param string $permissions,... Permissions to test
 	 * @return bool True if the user is allowed to perform *all* of the given actions
 	 */
 	public function isAllowedAll() {
@@ -3661,7 +3661,7 @@ class User implements IDBAccessObject {
 	 * If e-notif e-mails are on, they will receive notification mails on
 	 * the next change of the page if it's watched etc.
 	 * @note If the user doesn't have 'editmywatchlist', this will do nothing.
-	 * @param Title $title Title of the article to look at
+	 * @param Title &$title Title of the article to look at
 	 * @param int $oldid The revision id being viewed. If not given or 0, latest revision is assumed.
 	 */
 	public function clearNotification( &$title, $oldid = 0 ) {
@@ -4131,7 +4131,7 @@ class User implements IDBAccessObject {
 		}
 		$dbw->insert( 'user', $fields, __METHOD__, [ 'IGNORE' ] );
 		if ( $dbw->affectedRows() ) {
-			$newUser = User::newFromId( $dbw->insertId() );
+			$newUser = self::newFromId( $dbw->insertId() );
 		} else {
 			$newUser = null;
 		}
@@ -5036,7 +5036,7 @@ class User implements IDBAccessObject {
 			// Do nothing
 		} elseif ( $wgGroupsAddToSelf[$group] === true ) {
 			// No idea WHY this would be used, but it's there
-			$groups['add-self'] = User::getAllGroups();
+			$groups['add-self'] = self::getAllGroups();
 		} elseif ( is_array( $wgGroupsAddToSelf[$group] ) ) {
 			$groups['add-self'] = $wgGroupsAddToSelf[$group];
 		}
@@ -5044,7 +5044,7 @@ class User implements IDBAccessObject {
 		if ( empty( $wgGroupsRemoveFromSelf[$group] ) ) {
 			// Do nothing
 		} elseif ( $wgGroupsRemoveFromSelf[$group] === true ) {
-			$groups['remove-self'] = User::getAllGroups();
+			$groups['remove-self'] = self::getAllGroups();
 		} elseif ( is_array( $wgGroupsRemoveFromSelf[$group] ) ) {
 			$groups['remove-self'] = $wgGroupsRemoveFromSelf[$group];
 		}
@@ -5065,7 +5065,7 @@ class User implements IDBAccessObject {
 			// compatibility with old "userrights lets you change
 			// everything")
 			// Using array_merge to make the groups reindexed
-			$all = array_merge( User::getAllGroups() );
+			$all = array_merge( self::getAllGroups() );
 			return [
 				'add' => $all,
 				'remove' => $all,
@@ -5491,7 +5491,7 @@ class User implements IDBAccessObject {
 		global $wgLang;
 
 		$groups = [];
-		foreach ( User::getGroupsWithPermission( $permission ) as $group ) {
+		foreach ( self::getGroupsWithPermission( $permission ) as $group ) {
 			$groups[] = UserGroupMembership::getLink( $group, RequestContext::getMain(), 'wiki' );
 		}