nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove some constants and functions which have been long deprecated 

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2022-09-29 15:15:20 +02:00 committed by Côme Chilliet (Rebase PR Action)
parent 6c2230c3d9
commit 5347fb02dc
4 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/private/ContactsManager.php
View File

@ -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
*

9
lib/public/Contacts/IManager.php
View File

@ -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
*

21
lib/public/Util.php
View File

@ -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;

2
tests/lib/ContactsManagerTest.php
View File

@ -232,7 +232,7 @@ class ContactsManagerTest extends \Test\TestCase {
// register the address book
$this->cm->registerAddressBook($addressbook);
$all_books = $this->cm->getAddressBooks();
$all_books = $this->cm->getUserAddressBooks();
$this->assertEquals(1, count($all_books));
$this->assertEquals('A very simple Addressbook', $all_books['SIMPLE_ADDRESS_BOOK']);