From 5347fb02dca9f55d44392d15e1c1a020d5912240 Mon Sep 17 00:00:00 2001 From: Côme Chilliet Date: Thu, 29 Sep 2022 15:15:20 +0200 Subject: Remove some constants and functions which have been long deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/private/ContactsManager.php | 18 ------------------ lib/public/Contacts/IManager.php | 9 --------- lib/public/Util.php | 21 --------------------- 3 files changed, 48 deletions(-) (limited to 'lib') diff --git a/lib/private/ContactsManager.php b/lib/private/ContactsManager.php index 68783e3f79b..9853701a2eb 100644 --- a/lib/private/ContactsManager.php +++ b/lib/private/ContactsManager.php @@ -147,24 +147,6 @@ class ContactsManager implements IManager { unset($this->addressBooks[$addressBook->getKey()]); } - /** - * Return a list of the user's addressbooks display names - * ! The addressBook displayName are not unique, please use getUserAddressBooks - * - * @return IAddressBook[] - * @since 6.0.0 - * @deprecated 16.0.0 - Use `$this->getUserAddressBooks()` instead - */ - public function getAddressBooks() { - $this->loadAddressBooks(); - $result = []; - foreach ($this->addressBooks as $addressBook) { - $result[$addressBook->getKey()] = $addressBook->getDisplayName(); - } - - return $result; - } - /** * Return a list of the user's addressbooks * diff --git a/lib/public/Contacts/IManager.php b/lib/public/Contacts/IManager.php index 65be12c4c39..ce50f8d5b32 100644 --- a/lib/public/Contacts/IManager.php +++ b/lib/public/Contacts/IManager.php @@ -159,15 +159,6 @@ interface IManager { */ public function register(\Closure $callable); - /** - * Return a list of the user's addressbooks display names - * - * @return array - * @since 6.0.0 - * @deprecated 16.0.0 - Use `$this->getUserAddressBooks()` instead - */ - public function getAddressBooks(); - /** * Return a list of the user's addressbooks * diff --git a/lib/public/Util.php b/lib/public/Util.php index 6cd3eaa7f85..1289f8ccff4 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -56,27 +56,6 @@ use bantu\IniGetWrapper\IniGetWrapper; * @since 4.0.0 */ class Util { - /** - * @deprecated 14.0.0 use \OCP\ILogger::DEBUG - */ - public const DEBUG = 0; - /** - * @deprecated 14.0.0 use \OCP\ILogger::INFO - */ - public const INFO = 1; - /** - * @deprecated 14.0.0 use \OCP\ILogger::WARN - */ - public const WARN = 2; - /** - * @deprecated 14.0.0 use \OCP\ILogger::ERROR - */ - public const ERROR = 3; - /** - * @deprecated 14.0.0 use \OCP\ILogger::FATAL - */ - public const FATAL = 4; - /** @var \OCP\Share\IManager */ private static $shareManager; -- cgit v1.2.3