Merge pull request #12142 from owncloud/DeprecateOldIAPICalls

Deprecate older API wrappers and calls

2 files changed, 4 insertions, 0 deletions

diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
index 9af251be850..ecbc0fd1900 100644
--- a/lib/public/appframework/iapi.php
+++ b/lib/public/appframework/iapi.php
@@ -37,6 +37,7 @@ interface IApi {
 	/**
 	 * Gets the userid of the current user
 	 * @return string the user id of the current user
+	 * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
 	 */
 	function getUserId();
 
diff --git a/lib/public/user.php b/lib/public/user.php
index 925410d37d5..e9835620433 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -38,6 +38,7 @@ class User {
 	/**
 	 * Get the user id of the user currently logged in.
 	 * @return string uid or false
+	 * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
 	 */
 	public static function getUser() {
 		return \OC_User::getUser();
@@ -94,6 +95,7 @@ class User {
 	/**
 	 * Logs the user out including all the session data
 	 * Logout, destroys session
+	 * @deprecated Use \OC::$server->getUserSession()->logout();
 	 */
 	public static function logout() {
 		\OC_User::logout();
@@ -106,6 +108,7 @@ class User {
 	 * @return string|false username on success, false otherwise
 	 *
 	 * Check if the password is correct without logging in the user
+	 * @deprecated Use \OC::$server->getUserManager()->checkPassword();
 	 */
 	public static function checkPassword( $uid, $password ) {
 		return \OC_User::checkPassword( $uid, $password );