Merge pull request #34329 from nextcloud/fix/cleanup-long-time-deprec…

…ated-stuff Remove some constants and functions which have been long deprecated
nextcloud · Oct 1, 2022 · a4c2aee · a4c2aee
2 parents f317025 + 4123eee
commit a4c2aee
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 50 deletions.
diff --git a/lib/private/ContactsManager.php b/lib/private/ContactsManager.php
@@ -147,24 +147,6 @@ public function unregisterAddressBook(IAddressBook $addressBook) {
 		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
@@ -159,15 +159,6 @@ public function unregisterAddressBook(\OCP\IAddressBook $address_book);
 	 */
 	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
@@ -56,27 +56,6 @@
  * @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;
 

diff --git a/tests/lib/ContactsManagerTest.php b/tests/lib/ContactsManagerTest.php
@@ -232,9 +232,9 @@ public function testAddressBookEnumeration() {
 
 		// 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']);
 	}
 }