Remove some constants and functions which have been long deprecatedtags/v26.0.0beta1
@@ -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 | |||
* |
@@ -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 | |||
* |
@@ -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; | |||
@@ -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']); | |||
} | |||
} |