Renamed search attribute backend interface

owncloud · May 12, 2017 · 5ebc7bc · 5ebc7bc
1 parent 25b9ce4
commit 5ebc7bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
@@ -38,7 +38,7 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IConfig;
-use OCP\User\IProvidesAdditionalSearchAttributesBackend;
+use OCP\User\IProvidesExtendedSearchBackend;
 use OCP\User\IProvidesEMailBackend;
 use OCP\User\IProvidesQuotaBackend;
 use OCP\UserInterface;
@@ -257,7 +257,6 @@ public function find($pattern, $limit = null, $offset = null) {
 			$user = $this->getUserObject($account);
 			$users[$user->getUID()] = $user;
 		}
-
 		return $users;
 	}
 
@@ -426,7 +425,7 @@ private function newAccount($uid, $backend) {
 				$account->setQuota($quota);
 			}
 		}
-		if ($backend instanceof IProvidesAdditionalSearchAttributesBackend) {
+		if ($backend instanceof IProvidesExtendedSearchBackend) {
 			$searchString = $backend->getSearchAttributes($uid);
 			if ($searchString !== null) {
 				$account->setSearchAttributes($searchString);

diff --git a/lib/private/User/SyncService.php b/lib/private/User/SyncService.php
@@ -23,7 +23,7 @@
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\IConfig;
 use OCP\ILogger;
-use OCP\User\IProvidesAdditionalSearchAttributesBackend;
+use OCP\User\IProvidesExtendedSearchBackend;
 use OCP\UserInterface;
 
 /**
@@ -160,7 +160,7 @@ public function setupAccount(Account $a, $uid) {
 			$a->setDisplayName($this->backend->getDisplayName($uid));
 		}
 		// Check if backend supplies an additional search string
-		if ($this->backend instanceof IProvidesAdditionalSearchAttributesBackend) {
+		if ($this->backend instanceof IProvidesExtendedSearchBackend) {
 			$a->setSearchAttributes($this->backend->getSearchAttributes($uid));
 		}
 		return $a;

diff --git a/...idesAdditionalSearchAttributesBackend.php → ...c/User/IProvidesExtendedSearchBackend.php b/...idesAdditionalSearchAttributesBackend.php → ...c/User/IProvidesExtendedSearchBackend.php
@@ -25,12 +25,13 @@
 namespace OCP\User;
 
 /**
- * Interface IProvidesAdditionalSearchAttributesBackend
+ * Interface IProvidesExtendedSearchBackend
  *
+ * TODO update these backend interface names to be consistent and readable
  * @package OCP\User
  * @since 10.0.1
  */
-interface IProvidesAdditionalSearchAttributesBackend {
+interface IProvidesExtendedSearchBackend {
 
 	/**
 	 * Get a users search string for core powered user search