From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 23 Mar 2016 14:58:51 +0000 (+0000)
Subject: Merge "Ensure that User::getId() returns int"
X-Git-Tag: 1.31.0-rc.0~7542
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27votes%27%2C%20votes=%27waiting%27%29%20%7D%7D?a=commitdiff_plain;h=2f2797e53a60bcdb68b19543dd3258cc2f894617;hp=15474ac5517df375f1dc6ae2c2e6d8ab695b7ecd;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/user/User.php b/includes/user/User.php
index e553ddcbec..027edf929b 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -200,6 +200,7 @@ class User implements IDBAccessObject {
 
 	/** Cache variables */
 	// @{
+	/** @var int */
 	public $mId;
 	/** @var string */
 	public $mName;
@@ -2052,7 +2053,8 @@ class User implements IDBAccessObject {
 			// Don't load if this was initialized from an ID
 			$this->load();
 		}
-		return $this->mId;
+
+		return (int)$this->mId;
 	}
 
 	/**