From 5ebc7bcbe3ed3ffd648f8327d80e59303e6a1920 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 12 May 2017 13:43:10 +0100
Subject: [PATCH] Renamed search attribute backend interface

---
 lib/private/User/Manager.php                                 | 5 ++---
 lib/private/User/SyncService.php                             | 4 ++--
 ...ributesBackend.php => IProvidesExtendedSearchBackend.php} | 5 +++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename lib/public/User/{IProvidesAdditionalSearchAttributesBackend.php => IProvidesExtendedSearchBackend.php} (87%)

diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index e1affd2f9481..df587be1c388 100644
--- 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
index fc1c5fcbd37f..d9fac48eae96 100644
--- 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/lib/public/User/IProvidesAdditionalSearchAttributesBackend.php b/lib/public/User/IProvidesExtendedSearchBackend.php
similarity index 87%
rename from lib/public/User/IProvidesAdditionalSearchAttributesBackend.php
rename to lib/public/User/IProvidesExtendedSearchBackend.php
index 516ec1a1a8b0..b38c1bf99366 100644
--- a/lib/public/User/IProvidesAdditionalSearchAttributesBackend.php
+++ b/lib/public/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