Merge "Ensure that User::getId() returns int"

diff --combined includes/user/User.php
index e553ddc,3a891f6..027edf9
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -200,6 -200,7 +200,7 @@@ class User implements IDBAccessObject 
  
        /** Cache variables */
        // @{
+       /** @var int */
        public $mId;
        /** @var string */
        public $mName;
@@@ -2052,7 -2053,8 +2053,8 @@@
                        // Don't load if this was initialized from an ID
                        $this->load();
                }
-               return $this->mId;
+ 
+               return (int)$this->mId;
        }
  
        /**
@@@ -2162,7 -2164,7 +2164,7 @@@
                // Get the "last viewed rev" timestamp from the oldest message notification
                $timestamp = $dbr->selectField( 'user_newtalk',
                        'MIN(user_last_timestamp)',
 -                      $this->isAnon() ? [ 'user_ip' => $this->getName() ] : [ 'user_id' => $this->getID() ],
 +                      $this->isAnon() ? [ 'user_ip' => $this->getName() ] : [ 'user_id' => $this->getId() ],
                        __METHOD__ );
                $rev = $timestamp ? Revision::loadFromTimestamp( $dbr, $utp, $timestamp ) : null;
                return [ [ 'wiki' => wfWikiID(), 'link' => $utp->getLocalURL(), 'rev' => $rev ] ];
@@@ -3268,7 -3270,7 +3270,7 @@@
                if ( $this->getId() ) {
                        $dbw->insert( 'user_groups',
                                [
 -                                      'ug_user' => $this->getID(),
 +                                      'ug_user' => $this->getId(),
                                        'ug_group' => $group,
                                ],
                                __METHOD__,
@@@ -3306,14 -3308,14 +3308,14 @@@
                $dbw = wfGetDB( DB_MASTER );
                $dbw->delete( 'user_groups',
                        [
 -                              'ug_user' => $this->getID(),
 +                              'ug_user' => $this->getId(),
                                'ug_group' => $group,
                        ], __METHOD__
                );
                // Remember that the user was in this group
                $dbw->insert( 'user_former_groups',
                        [
 -                              'ufg_user' => $this->getID(),
 +                              'ufg_user' => $this->getId(),
                                'ufg_group' => $group,
                        ],
                        __METHOD__,
@@@ -3338,7 -3340,7 +3340,7 @@@
         * @return bool
         */
        public function isLoggedIn() {
 -              return $this->getID() != 0;
 +              return $this->getId() != 0;
        }
  
        /**
@@@ -3989,7 -3991,6 +3991,7 @@@
                if ( $this->isLoggedIn() && $this->isBlocked() ) {
                        return $this->spreadBlock();
                }
 +
                return false;
        }