upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #34329 from nextcloud/fix/cleanup-long-time-deprecated-stuff

Browse source 
Remove some constants and functions which have been long deprecated
This commit is contained in:
Côme Chilliet 2022-10-01 17:55:31 +02:00 committed by GitHub
commit a4c2aeef45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 50 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;

4
tests/lib/ContactsManagerTest.php
View file

@ -232,9 +232,9 @@ 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']);
$this->assertEquals($addressbook, $all_books['SIMPLE_ADDRESS_BOOK']);
}
}