From b930f32e89a0f890ebda449ab3d37952f9a4317e Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 24 Jul 2017 20:42:55 +0200 Subject: Remove legacy OC_User_Backend and OC_User_Interface Signed-off-by: Roeland Jago Douma --- lib/private/legacy/user.php | 2 +- lib/private/legacy/user/backend.php | 62 ----------------------------------- lib/private/legacy/user/interface.php | 29 ---------------- 3 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 lib/private/legacy/user/backend.php delete mode 100644 lib/private/legacy/user/interface.php (limited to 'lib/private/legacy') diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index 2b0fba73366..feed6f836ca 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -175,7 +175,7 @@ class OC_User { self::setUserId($uid); $setUidAsDisplayName = true; if($backend instanceof \OCP\UserInterface - && $backend->implementsActions(OC_User_Backend::GET_DISPLAYNAME)) { + && $backend->implementsActions(\OC\User\Backend::GET_DISPLAYNAME)) { $backendDisplayName = $backend->getDisplayName($uid); if(is_string($backendDisplayName) && trim($backendDisplayName) !== '') { diff --git a/lib/private/legacy/user/backend.php b/lib/private/legacy/user/backend.php deleted file mode 100644 index 86909c1438a..00000000000 --- a/lib/private/legacy/user/backend.php +++ /dev/null @@ -1,62 +0,0 @@ - - * @author Dominik Schmidt - * @author Jakob Sack - * @author Joas Schilling - * @author Morris Jobke - * @author Roeland Jago Douma - * @author Sam Tuke - * @author Tigran Mkrtchyan - * - * @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/legacy/user/interface.php b/lib/private/legacy/user/interface.php deleted file mode 100644 index e178d9c6f68..00000000000 --- a/lib/private/legacy/user/interface.php +++ /dev/null @@ -1,29 +0,0 @@ - - * @author Jörn Friedrich Dreyer - * @author Morris Jobke - * - * @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 - * - */ - -/** - * Interface OC_User_Interface - * @deprecated use the public \OCP\UserInterface instead - */ -interface OC_User_Interface extends \OCP\UserInterface {} -- cgit v1.2.3