From d85a351e7777d646e129dd2644355c6dc030f4b1 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 3 Mar 2017 00:31:33 -0600 Subject: [PATCH] Cleanup not used legacy classes * Person was removed via #2170 * other lcasses/interfaces are not used at all Signed-off-by: Morris Jobke --- apps/federatedfilesharing/tests/TestCase.php | 3 +- lib/private/legacy/group/database.php | 30 ----- lib/private/legacy/group/example.php | 118 ------------------- lib/private/legacy/group/interface.php | 29 ----- lib/private/legacy/ocs/person.php | 28 ----- 5 files changed, 2 insertions(+), 206 deletions(-) delete mode 100644 lib/private/legacy/group/database.php delete mode 100644 lib/private/legacy/group/example.php delete mode 100644 lib/private/legacy/group/interface.php delete mode 100644 lib/private/legacy/ocs/person.php diff --git a/apps/federatedfilesharing/tests/TestCase.php b/apps/federatedfilesharing/tests/TestCase.php index 3ce1cac860c..7ccf76bbbc6 100644 --- a/apps/federatedfilesharing/tests/TestCase.php +++ b/apps/federatedfilesharing/tests/TestCase.php @@ -23,6 +23,7 @@ namespace OCA\FederatedFileSharing\Tests; use OC\Files\Filesystem; +use OC\Group\Database; /** * Class Test_Files_Sharing_Base @@ -76,7 +77,7 @@ abstract class TestCase extends \Test\TestCase { \OC_User::clearBackends(); \OC_User::useBackend('database'); \OC_Group::clearBackends(); - \OC_Group::useBackend(new \OC_Group_Database()); + \OC_Group::useBackend(new Database()); parent::tearDownAfterClass(); } diff --git a/lib/private/legacy/group/database.php b/lib/private/legacy/group/database.php deleted file mode 100644 index ddf9d29037e..00000000000 --- a/lib/private/legacy/group/database.php +++ /dev/null @@ -1,30 +0,0 @@ - - * @author Roeland Jago Douma - * - * @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 - * - */ - -/** - * Class OC_Group_Database - * @deprecated Since 9.1.0 use \OC\Group\Database - */ -class OC_Group_Database extends \OC\Group\Database { - -} \ No newline at end of file diff --git a/lib/private/legacy/group/example.php b/lib/private/legacy/group/example.php deleted file mode 100644 index c800c54b8a0..00000000000 --- a/lib/private/legacy/group/example.php +++ /dev/null @@ -1,118 +0,0 @@ - - * @author Felix Moeller - * @author Lukas Reschke - * @author Michael Gapczynski - * @author Morris Jobke - * @author Robin Appelman - * @author Robin McCorkell - * - * @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 - * - */ - -/** - * abstract reference class for group management - * this class should only be used as a reference for method signatures and their descriptions - */ -abstract class OC_Group_Example { - /** - * Try to create a new group - * @param string $gid The name of the group to create - * @return bool - * - * Tries to create a new group. If the group name already exists, false will - * be returned. - */ - abstract public static function createGroup($gid); - - /** - * delete a group - * @param string $gid gid of the group to delete - * @return bool - * - * Deletes a group and removes it from the group_user-table - */ - abstract public static function deleteGroup($gid); - - /** - * is user in group? - * @param string $uid uid of the user - * @param string $gid gid of the group - * @return bool - * - * Checks whether the user is member of a group or not. - */ - abstract public static function inGroup($uid, $gid); - - /** - * Add a user to a group - * @param string $uid Name of the user to add to group - * @param string $gid Name of the group in which add the user - * @return bool - * - * Adds a user to a group. - */ - abstract public static function addToGroup($uid, $gid); - - /** - * Removes a user from a group - * @param string $uid Name of the user to remove from group - * @param string $gid Name of the group from which remove the user - * @return bool - * - * removes the user from a group. - */ - abstract public static function removeFromGroup($uid, $gid); - - /** - * Get all groups a user belongs to - * @param string $uid Name of the user - * @return array an array of group names - * - * This function fetches all groups a user belongs to. It does not check - * if the user exists at all. - */ - abstract public static function getUserGroups($uid); - - /** - * get a list of all groups - * @param string $search - * @param int $limit - * @param int $offset - * @return array an array of group names - */ - abstract public static function getGroups($search = '', $limit = -1, $offset = 0); - - /** - * Check if a group exists - * @param string $gid - * @return bool - */ - abstract public function groupExists($gid); - - /** - * get a list of all users in a group - * @param string $gid - * @param string $search - * @param int $limit - * @param int $offset - * @return array an array of user ids - */ - abstract public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0); -} diff --git a/lib/private/legacy/group/interface.php b/lib/private/legacy/group/interface.php deleted file mode 100644 index c3563b15776..00000000000 --- a/lib/private/legacy/group/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_Group_Interface - * @deprecated use the public \OCP\GroupInterface instead - */ -interface OC_Group_Interface extends \OCP\GroupInterface {} diff --git a/lib/private/legacy/ocs/person.php b/lib/private/legacy/ocs/person.php deleted file mode 100644 index bd01639a737..00000000000 --- a/lib/private/legacy/ocs/person.php +++ /dev/null @@ -1,28 +0,0 @@ - - * @author Thomas Müller - * - * @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 - * - */ - -/** - * @deprecated Since 9.1.0 use \OC\OCS\Person - */ -class OC_OCS_Person extends \OC\OCS\Person { -} -- 2.39.5