diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 224cf5c9a3..d6b345faf4 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -419,11 +419,11 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn * compared with OC_USER_BACKEND_CREATE_USER etc. */ public function implementsActions($actions) { - return (bool)((\OC_User_Backend::CHECK_PASSWORD - | \OC_User_Backend::GET_HOME - | \OC_User_Backend::GET_DISPLAYNAME - | \OC_User_Backend::PROVIDE_AVATAR - | \OC_User_Backend::COUNT_USERS) + return (bool)((\OC\User\Backend::CHECK_PASSWORD + | \OC\User\Backend::GET_HOME + | \OC\User\Backend::GET_DISPLAYNAME + | \OC\User\Backend::PROVIDE_AVATAR + | \OC\User\Backend::COUNT_USERS) & $actions); } diff --git a/lib/base.php b/lib/base.php index badbe3cd1f..0ea8a117e9 100644 --- a/lib/base.php +++ b/lib/base.php @@ -619,7 +619,7 @@ class OC { self::$server->getSession()->set('user_id', ''); } - OC_User::useBackend(new OC_User_Database()); + OC_User::useBackend(new \OC\User\Database()); OC_Group::useBackend(new OC_Group_Database()); // Subscribe to the hook diff --git a/lib/private/user/backend.php b/lib/private/User/Backend.php similarity index 79% rename from lib/private/user/backend.php rename to lib/private/User/Backend.php index 2bb1df4d6b..d5f82dc962 100644 --- a/lib/private/user/backend.php +++ b/lib/private/User/Backend.php @@ -32,37 +32,13 @@ * */ -/** - * error code for functions not provided by the user backend - * @deprecated Use \OC_User_Backend::NOT_IMPLEMENTED instead - */ -define('OC_USER_BACKEND_NOT_IMPLEMENTED', -501); - -/** - * actions that user backends can define - */ -/** @deprecated Use \OC_User_Backend::CREATE_USER instead */ -define('OC_USER_BACKEND_CREATE_USER', 1 << 0); -/** @deprecated Use \OC_User_Backend::SET_PASSWORD instead */ -define('OC_USER_BACKEND_SET_PASSWORD', 1 << 4); -/** @deprecated Use \OC_User_Backend::CHECK_PASSWORD instead */ -define('OC_USER_BACKEND_CHECK_PASSWORD', 1 << 8); -/** @deprecated Use \OC_User_Backend::GET_HOME instead */ -define('OC_USER_BACKEND_GET_HOME', 1 << 12); -/** @deprecated Use \OC_User_Backend::GET_DISPLAYNAME instead */ -define('OC_USER_BACKEND_GET_DISPLAYNAME', 1 << 16); -/** @deprecated Use \OC_User_Backend::SET_DISPLAYNAME instead */ -define('OC_USER_BACKEND_SET_DISPLAYNAME', 1 << 20); -/** @deprecated Use \OC_User_Backend::PROVIDE_AVATAR instead */ -define('OC_USER_BACKEND_PROVIDE_AVATAR', 1 << 24); -/** @deprecated Use \OC_User_Backend::COUNT_USERS instead */ -define('OC_USER_BACKEND_COUNT_USERS', 1 << 28); +namespace OC\User; /** * Abstract base class for user management. Provides methods for querying backend * capabilities. */ -abstract class OC_User_Backend implements \OCP\UserInterface { +abstract class Backend implements \OCP\UserInterface { /** * error code for functions not provided by the user backend */ diff --git a/lib/private/user/database.php b/lib/private/User/Database.php similarity index 87% rename from lib/private/user/database.php rename to lib/private/User/Database.php index fd273055ae..7a4b58e6f4 100644 --- a/lib/private/user/database.php +++ b/lib/private/User/Database.php @@ -48,12 +48,14 @@ * */ +namespace OC\User; + use OC\Cache\CappedMemoryCache; /** * Class for user management in a SQL Database (e.g. MySQL, SQLite) */ -class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { +class Database extends \OC\User\Backend implements \OCP\IUserBackend { /** @var CappedMemoryCache */ private $cache; @@ -75,7 +77,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { */ public function createUser($uid, $password) { if (!$this->userExists($uid)) { - $query = OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )'); + $query = \OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )'); $result = $query->execute(array($uid, \OC::$server->getHasher()->hash($password))); return $result ? true : false; @@ -93,7 +95,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { */ public function deleteUser($uid) { // Delete user-group-relation - $query = OC_DB::prepare('DELETE FROM `*PREFIX*users` WHERE `uid` = ?'); + $query = \OC_DB::prepare('DELETE FROM `*PREFIX*users` WHERE `uid` = ?'); $result = $query->execute(array($uid)); if (isset($this->cache[$uid])) { @@ -113,7 +115,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { */ public function setPassword($uid, $password) { if ($this->userExists($uid)) { - $query = OC_DB::prepare('UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?'); + $query = \OC_DB::prepare('UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?'); $result = $query->execute(array(\OC::$server->getHasher()->hash($password), $uid)); return $result ? true : false; @@ -132,7 +134,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { */ public function setDisplayName($uid, $displayName) { if ($this->userExists($uid)) { - $query = OC_DB::prepare('UPDATE `*PREFIX*users` SET `displayname` = ? WHERE LOWER(`uid`) = LOWER(?)'); + $query = \OC_DB::prepare('UPDATE `*PREFIX*users` SET `displayname` = ? WHERE LOWER(`uid`) = LOWER(?)'); $query->execute(array($displayName, $uid)); $this->cache[$uid]['displayname'] = $displayName; @@ -171,7 +173,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { } $displayNames = array(); - $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`' + $query = \OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`' . $searchLike .' ORDER BY `uid` ASC', $limit, $offset); $result = $query->execute($parameters); while ($row = $result->fetchRow()) { @@ -191,7 +193,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { * returns the user id or false */ public function checkPassword($uid, $password) { - $query = OC_DB::prepare('SELECT `uid`, `password` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)'); + $query = \OC_DB::prepare('SELECT `uid`, `password` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)'); $result = $query->execute(array($uid)); $row = $result->fetchRow(); @@ -217,11 +219,11 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { */ private function loadUser($uid) { if (empty($this->cache[$uid])) { - $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)'); + $query = \OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)'); $result = $query->execute(array($uid)); if ($result === false) { - \OCP\Util::writeLog('core', OC_DB::getErrorMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('core', \OC_DB::getErrorMessage(), \OCP\Util::ERROR); return false; } @@ -250,7 +252,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { $searchLike = ' WHERE LOWER(`uid`) LIKE LOWER(?)'; } - $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY `uid` ASC', $limit, $offset); + $query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY `uid` ASC', $limit, $offset); $result = $query->execute($parameters); $users = array(); while ($row = $result->fetchRow()) { @@ -276,7 +278,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { */ public function getHome($uid) { if ($this->userExists($uid)) { - return \OC::$server->getConfig()->getSystemValue("datadirectory", OC::$SERVERROOT . "/data") . '/' . $uid; + return \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $uid; } return false; @@ -295,10 +297,10 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { * @return int|bool */ public function countUsers() { - $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); + $query = \OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); $result = $query->execute(); if ($result === false) { - \OCP\Util::writeLog('core', OC_DB::getErrorMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('core', \OC_DB::getErrorMessage(), \OCP\Util::ERROR); return false; } return $result->fetchOne(); @@ -333,8 +335,8 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend { $backends = \OC::$server->getUserManager()->getBackends(); foreach ($backends as $backend) { - if ($backend instanceof \OC_User_Database) { - /** @var \OC_User_Database $backend */ + if ($backend instanceof \OC\User\Database) { + /** @var \OC\User\Database $backend */ $uid = $backend->loginName2UserName($param['uid']); if ($uid !== false) { $param['uid'] = $uid; diff --git a/lib/private/user/loginexception.php b/lib/private/User/LoginException.php similarity index 100% rename from lib/private/user/loginexception.php rename to lib/private/User/LoginException.php diff --git a/lib/private/user/manager.php b/lib/private/User/Manager.php similarity index 98% rename from lib/private/user/manager.php rename to lib/private/User/Manager.php index 37a3e5ba13..a9d9425e24 100644 --- a/lib/private/user/manager.php +++ b/lib/private/User/Manager.php @@ -186,7 +186,7 @@ class Manager extends PublicEmitter implements IUserManager { $password = str_replace("\0", '', $password); foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC_User_Backend::CHECK_PASSWORD)) { + if ($backend->implementsActions(\OC\User\Backend::CHECK_PASSWORD)) { $uid = $backend->checkPassword($loginName, $password); if ($uid !== false) { return $this->getUserObject($uid, $backend); @@ -290,7 +290,7 @@ class Manager extends PublicEmitter implements IUserManager { $this->emit('\OC\User', 'preCreateUser', array($uid, $password)); foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC_User_Backend::CREATE_USER)) { + if ($backend->implementsActions(\OC\User\Backend::CREATE_USER)) { $backend->createUser($uid, $password); $user = $this->getUserObject($uid, $backend); $this->emit('\OC\User', 'postCreateUser', array($user, $password)); @@ -308,7 +308,7 @@ class Manager extends PublicEmitter implements IUserManager { public function countUsers() { $userCountStatistics = array(); foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC_User_Backend::COUNT_USERS)) { + if ($backend->implementsActions(\OC\User\Backend::COUNT_USERS)) { $backendUsers = $backend->countUsers(); if($backendUsers !== false) { if($backend instanceof IUserBackend) { diff --git a/lib/private/user/nouserexception.php b/lib/private/User/NoUserException.php similarity index 100% rename from lib/private/user/nouserexception.php rename to lib/private/User/NoUserException.php diff --git a/lib/private/user/session.php b/lib/private/User/Session.php similarity index 100% rename from lib/private/user/session.php rename to lib/private/User/Session.php diff --git a/lib/private/user/user.php b/lib/private/User/User.php similarity index 95% rename from lib/private/user/user.php rename to lib/private/User/User.php index 3668043676..66ecbd1853 100644 --- a/lib/private/user/user.php +++ b/lib/private/User/User.php @@ -110,7 +110,7 @@ class User implements IUser { public function getDisplayName() { if (!isset($this->displayName)) { $displayName = ''; - if ($this->backend and $this->backend->implementsActions(\OC_User_Backend::GET_DISPLAYNAME)) { + if ($this->backend and $this->backend->implementsActions(\OC\User\Backend::GET_DISPLAYNAME)) { // get display name and strip whitespace from the beginning and end of it $backendDisplayName = $this->backend->getDisplayName($this->uid); if (is_string($backendDisplayName)) { @@ -135,7 +135,7 @@ class User implements IUser { */ public function setDisplayName($displayName) { $displayName = trim($displayName); - if ($this->backend->implementsActions(\OC_User_Backend::SET_DISPLAYNAME) && !empty($displayName)) { + if ($this->backend->implementsActions(\OC\User\Backend::SET_DISPLAYNAME) && !empty($displayName)) { $result = $this->backend->setDisplayName($this->uid, $displayName); if ($result) { $this->displayName = $displayName; @@ -230,7 +230,7 @@ class User implements IUser { if ($this->emitter) { $this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword)); } - if ($this->backend->implementsActions(\OC_User_Backend::SET_PASSWORD)) { + if ($this->backend->implementsActions(\OC\User\Backend::SET_PASSWORD)) { $result = $this->backend->setPassword($this->uid, $password); if ($this->emitter) { $this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword)); @@ -248,7 +248,7 @@ class User implements IUser { */ public function getHome() { if (!$this->home) { - if ($this->backend->implementsActions(\OC_User_Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) { + if ($this->backend->implementsActions(\OC\User\Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) { $this->home = $home; } elseif ($this->config) { $this->home = $this->config->getSystemValue('datadirectory') . '/' . $this->uid; @@ -277,7 +277,7 @@ class User implements IUser { * @return bool */ public function canChangeAvatar() { - if ($this->backend->implementsActions(\OC_User_Backend::PROVIDE_AVATAR)) { + if ($this->backend->implementsActions(\OC\User\Backend::PROVIDE_AVATAR)) { return $this->backend->canChangeAvatar($this->uid); } return true; @@ -289,7 +289,7 @@ class User implements IUser { * @return bool */ public function canChangePassword() { - return $this->backend->implementsActions(\OC_User_Backend::SET_PASSWORD); + return $this->backend->implementsActions(\OC\User\Backend::SET_PASSWORD); } /** @@ -301,7 +301,7 @@ class User implements IUser { if ($this->config->getSystemValue('allow_user_to_change_display_name') === false) { return false; } - return $this->backend->implementsActions(\OC_User_Backend::SET_DISPLAYNAME); + return $this->backend->implementsActions(\OC\User\Backend::SET_DISPLAYNAME); } /** diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index f0e829bbe3..7855b5e705 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -94,7 +94,7 @@ class OC_User { case 'mysql': case 'sqlite': \OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', \OCP\Util::DEBUG); - self::$_usedBackends[$backend] = new OC_User_Database(); + self::$_usedBackends[$backend] = new \OC\User\Database(); \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]); break; case 'dummy': diff --git a/lib/private/legacy/user/backend.php b/lib/private/legacy/user/backend.php new file mode 100644 index 0000000000..42c7b9aa12 --- /dev/null +++ b/lib/private/legacy/user/backend.php @@ -0,0 +1,67 @@ + + * @author Bart Visscher + * @author Björn Schießle + * @author Dominik Schmidt + * @author Georg Ehrke + * @author Jakob Sack + * @author Joas Schilling + * @author Jörn Friedrich Dreyer + * @author Lukas Reschke + * @author Morris Jobke + * @author Robin Appelman + * @author Sam Tuke + * @author Thomas Müller + * @author Tigran Mkrtchyan + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ + +/** + * error code for functions not provided by the user backend + * @deprecated Use \OC_User_Backend::NOT_IMPLEMENTED instead + */ +define('OC_USER_BACKEND_NOT_IMPLEMENTED', -501); + +/** + * actions that user backends can define + */ +/** @deprecated Use \OC_User_Backend::CREATE_USER instead */ +define('OC_USER_BACKEND_CREATE_USER', 1 << 0); +/** @deprecated Use \OC_User_Backend::SET_PASSWORD instead */ +define('OC_USER_BACKEND_SET_PASSWORD', 1 << 4); +/** @deprecated Use \OC_User_Backend::CHECK_PASSWORD instead */ +define('OC_USER_BACKEND_CHECK_PASSWORD', 1 << 8); +/** @deprecated Use \OC_User_Backend::GET_HOME instead */ +define('OC_USER_BACKEND_GET_HOME', 1 << 12); +/** @deprecated Use \OC_User_Backend::GET_DISPLAYNAME instead */ +define('OC_USER_BACKEND_GET_DISPLAYNAME', 1 << 16); +/** @deprecated Use \OC_User_Backend::SET_DISPLAYNAME instead */ +define('OC_USER_BACKEND_SET_DISPLAYNAME', 1 << 20); +/** @deprecated Use \OC_User_Backend::PROVIDE_AVATAR instead */ +define('OC_USER_BACKEND_PROVIDE_AVATAR', 1 << 24); +/** @deprecated Use \OC_User_Backend::COUNT_USERS instead */ +define('OC_USER_BACKEND_COUNT_USERS', 1 << 28); + +/** + * Abstract base class for user management. Provides methods for querying backend + * capabilities. + */ +abstract class OC_User_Backend extends \OC\User\Backend implements \OCP\UserInterface { + +} diff --git a/lib/private/user/interface.php b/lib/private/legacy/user/interface.php similarity index 100% rename from lib/private/user/interface.php rename to lib/private/legacy/user/interface.php diff --git a/tests/lib/user.php b/tests/lib/user.php index c4c74cbc25..dc5551d1ca 100644 --- a/tests/lib/user.php +++ b/tests/lib/user.php @@ -18,7 +18,7 @@ namespace Test; */ class User extends TestCase { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ private $backend; diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php index c2040f4e3b..d5bbbe9f40 100644 --- a/tests/lib/user/backend.php +++ b/tests/lib/user/backend.php @@ -32,7 +32,7 @@ abstract class Test_User_Backend extends \Test\TestCase { /** - * @var OC_User_Backend $backend + * @var \OC\User\Backend $backend */ protected $backend; diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php index ba44d333a8..0dea037ad7 100644 --- a/tests/lib/user/database.php +++ b/tests/lib/user/database.php @@ -37,7 +37,7 @@ class Test_User_Database extends Test_User_Backend { protected function setUp() { parent::setUp(); - $this->backend=new OC_User_Database(); + $this->backend=new \OC\User\Database(); } protected function tearDown() { diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php index 90e2f67c99..14221e4a66 100644 --- a/tests/lib/user/manager.php +++ b/tests/lib/user/manager.php @@ -118,7 +118,7 @@ class Manager extends \Test\TestCase { public function testCheckPassword() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->once()) @@ -145,7 +145,7 @@ class Manager extends \Test\TestCase { public function testCheckPasswordNotSupported() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->never()) diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php index a8d688d9c8..0a972f7bda 100644 --- a/tests/lib/user/user.php +++ b/tests/lib/user/user.php @@ -21,9 +21,9 @@ use OC\Hooks\PublicEmitter; class User extends \Test\TestCase { public function testDisplayName() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ - $backend = $this->getMock('\OC_User_Backend'); + $backend = $this->getMock('\OC\User\Backend'); $backend->expects($this->once()) ->method('getDisplayName') ->with($this->equalTo('foo')) @@ -31,7 +31,7 @@ class User extends \Test\TestCase { $backend->expects($this->any()) ->method('implementsActions') - ->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME)) + ->with($this->equalTo(\OC\User\Backend::GET_DISPLAYNAME)) ->will($this->returnValue(true)); $user = new \OC\User\User('foo', $backend); @@ -43,9 +43,9 @@ class User extends \Test\TestCase { */ public function testDisplayNameEmpty() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ - $backend = $this->getMock('\OC_User_Backend'); + $backend = $this->getMock('\OC\User\Backend'); $backend->expects($this->once()) ->method('getDisplayName') ->with($this->equalTo('foo')) @@ -53,7 +53,7 @@ class User extends \Test\TestCase { $backend->expects($this->any()) ->method('implementsActions') - ->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME)) + ->with($this->equalTo(\OC\User\Backend::GET_DISPLAYNAME)) ->will($this->returnValue(true)); $user = new \OC\User\User('foo', $backend); @@ -62,15 +62,15 @@ class User extends \Test\TestCase { public function testDisplayNameNotSupported() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ - $backend = $this->getMock('\OC_User_Backend'); + $backend = $this->getMock('\OC\User\Backend'); $backend->expects($this->never()) ->method('getDisplayName'); $backend->expects($this->any()) ->method('implementsActions') - ->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME)) + ->with($this->equalTo(\OC\User\Backend::GET_DISPLAYNAME)) ->will($this->returnValue(false)); $user = new \OC\User\User('foo', $backend); @@ -79,7 +79,7 @@ class User extends \Test\TestCase { public function testSetPassword() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->once()) @@ -89,7 +89,7 @@ class User extends \Test\TestCase { $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_SET_PASSWORD) { + if ($actions === \OC\User\Backend::SET_PASSWORD) { return true; } else { return false; @@ -102,7 +102,7 @@ class User extends \Test\TestCase { public function testSetPasswordNotSupported() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->never()) @@ -118,7 +118,7 @@ class User extends \Test\TestCase { public function testChangeAvatarSupportedYes() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ require_once 'avataruserdummy.php'; $backend = $this->getMock('Avatar_User_Dummy'); @@ -130,7 +130,7 @@ class User extends \Test\TestCase { $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_PROVIDE_AVATAR) { + if ($actions === \OC\User\Backend::PROVIDE_AVATAR) { return true; } else { return false; @@ -143,7 +143,7 @@ class User extends \Test\TestCase { public function testChangeAvatarSupportedNo() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ require_once 'avataruserdummy.php'; $backend = $this->getMock('Avatar_User_Dummy'); @@ -155,7 +155,7 @@ class User extends \Test\TestCase { $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_PROVIDE_AVATAR) { + if ($actions === \OC\User\Backend::PROVIDE_AVATAR) { return true; } else { return false; @@ -168,7 +168,7 @@ class User extends \Test\TestCase { public function testChangeAvatarNotSupported() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ require_once 'avataruserdummy.php'; $backend = $this->getMock('Avatar_User_Dummy'); @@ -187,7 +187,7 @@ class User extends \Test\TestCase { public function testDelete() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->once()) @@ -200,7 +200,7 @@ class User extends \Test\TestCase { public function testGetHome() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->once()) @@ -211,7 +211,7 @@ class User extends \Test\TestCase { $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_GET_HOME) { + if ($actions === \OC\User\Backend::GET_HOME) { return true; } else { return false; @@ -225,13 +225,13 @@ class User extends \Test\TestCase { public function testGetBackendClassName() { $user = new \OC\User\User('foo', new \Test\Util\User\Dummy()); $this->assertEquals('Dummy', $user->getBackendClassName()); - $user = new \OC\User\User('foo', new \OC_User_Database()); + $user = new \OC\User\User('foo', new \OC\User\Database()); $this->assertEquals('Database', $user->getBackendClassName()); } public function testGetHomeNotSupported() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->never()) @@ -258,14 +258,14 @@ class User extends \Test\TestCase { public function testCanChangePassword() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_SET_PASSWORD) { + if ($actions === \OC\User\Backend::SET_PASSWORD) { return true; } else { return false; @@ -278,7 +278,7 @@ class User extends \Test\TestCase { public function testCanChangePasswordNotSupported() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); @@ -292,14 +292,14 @@ class User extends \Test\TestCase { public function testCanChangeDisplayName() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) { + if ($actions === \OC\User\Backend::SET_DISPLAYNAME) { return true; } else { return false; @@ -312,7 +312,7 @@ class User extends \Test\TestCase { public function testCanChangeDisplayNameNotSupported() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); @@ -326,14 +326,14 @@ class User extends \Test\TestCase { public function testSetDisplayNameSupported() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ - $backend = $this->getMock('\OC_User_Database'); + $backend = $this->getMock('\OC\User\Database'); $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) { + if ($actions === \OC\User\Backend::SET_DISPLAYNAME) { return true; } else { return false; @@ -355,14 +355,14 @@ class User extends \Test\TestCase { */ public function testSetDisplayNameEmpty() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ - $backend = $this->getMock('\OC_User_Database'); + $backend = $this->getMock('\OC\User\Database'); $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) { + if ($actions === \OC\User\Backend::SET_DISPLAYNAME) { return true; } else { return false; @@ -376,9 +376,9 @@ class User extends \Test\TestCase { public function testSetDisplayNameNotSupported() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ - $backend = $this->getMock('\OC_User_Database'); + $backend = $this->getMock('\OC\User\Database'); $backend->expects($this->any()) ->method('implementsActions') @@ -399,7 +399,7 @@ class User extends \Test\TestCase { $test = $this; /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->once()) @@ -422,7 +422,7 @@ class User extends \Test\TestCase { $backend->expects($this->any()) ->method('implementsActions') ->will($this->returnCallback(function ($actions) { - if ($actions === \OC_USER_BACKEND_SET_PASSWORD) { + if ($actions === \OC\User\Backend::SET_PASSWORD) { return true; } else { return false; @@ -440,7 +440,7 @@ class User extends \Test\TestCase { $test = $this; /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $backend->expects($this->once()) @@ -465,7 +465,7 @@ class User extends \Test\TestCase { public function testGetCloudId() { /** - * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ $backend = $this->getMock('\Test\Util\User\Dummy'); $urlGenerator = $this->getMockBuilder('\OC\URLGenerator') diff --git a/tests/lib/util/user/dummy.php b/tests/lib/util/user/dummy.php index 6e23e22ab6..ea47f5d7d1 100644 --- a/tests/lib/util/user/dummy.php +++ b/tests/lib/util/user/dummy.php @@ -27,12 +27,12 @@ namespace Test\Util\User; -use OC_User_Backend; +use \OC\User\Backend; /** * dummy user backend, does not keep state, only for testing use */ -class Dummy extends OC_User_Backend implements \OCP\IUserBackend { +class Dummy extends Backend implements \OCP\IUserBackend { private $users = array(); private $displayNames = array(); diff --git a/tests/settings/controller/userscontrollertest.php b/tests/settings/controller/userscontrollertest.php index 6f07f34ba8..2a2b53d8ff 100644 --- a/tests/settings/controller/userscontrollertest.php +++ b/tests/settings/controller/userscontrollertest.php @@ -668,7 +668,7 @@ class UsersControllerTest extends \Test\TestCase { $this->container['UserManager'] ->expects($this->once()) ->method('getBackends') - ->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC_User_Database()])); + ->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC\User\Database()])); $this->container['UserManager'] ->expects($this->once()) ->method('clearBackends'); @@ -716,7 +716,7 @@ class UsersControllerTest extends \Test\TestCase { $this->container['UserManager'] ->expects($this->once()) ->method('getBackends') - ->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC_User_Database()])); + ->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC\User\Database()])); $this->container['UserManager'] ->expects($this->once()) ->method('search')