sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated \OCP\User::userExists 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/8976/head
Roeland Jago Douma 2018-03-25 20:42:38 +07:00
parent 7ebd96416c
commit 74f0e37233
No known key found for this signature in database
GPG Key ID: F941078878347C0C
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/user_ldap/tests/User_LDAPTest.php
Unescape Escape View File

@ -491,10 +491,9 @@ class User_LDAPTest extends TestCase {
private function getUsers($search = '', $limit = null, $offset = null) {
$users = \OC::$server->getUserManager()->search($search, $limit, $offset);
$uids = [];
foreach ($users as $user) {
$uids[] = $user->getUID();
}
$uids = array_map(function(IUser $user) {
return $user->getUID();
}, $users);
return $uids;
}
@ -1098,7 +1097,7 @@ class User_LDAPTest extends TestCase {
$this->assertEquals('Roland Deschain', $result);
//empty displayname retrieved
$result = \OC::$server->getUserManager()->get('newyorker')->getDisplayName();
$result = \OC::$server->getUserManager()->get('newyorker') === null ? 'newyorker' : \OC::$server->getUserManager()->get('newyorker')->getDisplayName();
$this->assertEquals('newyorker', $result);
}

7
lib/private/Encryption/Util.php
Unescape Escape View File

@ -35,6 +35,7 @@ use OC\Files\Filesystem;
use OC\Files\View;
use OCP\Encryption\IEncryptionModule;
use OCP\IConfig;
use OCP\IUser;
class Util {
@ -274,9 +275,9 @@ class Util {
$result = [];
if (in_array('all', $users)) {
$users = $this->userManager->search('', null, null);
foreach ($users as $user) {
$result[] = $user->getUID();
}
$result = array_map(function(IUser $user) {
return $user->getUID();
}, $users);
} else {
$result = array_merge($result, $users);

2
lib/private/Share/Share.php
Unescape Escape View File

@ -1252,7 +1252,7 @@ class Share extends Constants {
}
}
if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
$ownerUser = \OC::$server->get($row['uid_owner']);
$ownerUser = \OC::$server->getUserManager()->get($row['uid_owner']);
$row['displayname_owner'] = $ownerUser === null ? $row['uid_owner'] : $ownerUser->getDisplayName();
}

12
lib/public/User.php
Unescape Escape View File

@ -67,18 +67,6 @@ class User {
return \OC::$server->getUserSession()->isLoggedIn();
}
/**
* Check if a user exists
* @param string $uid the username
* @param string $excludingBackend (default none)
* @return boolean
* @deprecated 8.1.0 use method userExists() of \OCP\IUserManager - \OC::$server->getUserManager()
* @since 5.0.0
*/
public static function userExists($uid, $excludingBackend = null) {
return \OC::$server->getUserManager()->userExists($uid);
}
/**
* Check if the user is a admin, redirects to home if not
* @since 5.0.0