more consistent naming

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

9 files changed, 25 insertions, 25 deletions

diff --git a/apps/admin_audit/lib/Actions/UserManagement.php b/apps/admin_audit/lib/Actions/UserManagement.php
index 9e015160773..5cf1494df6e 100644
--- a/apps/admin_audit/lib/Actions/UserManagement.php
+++ b/apps/admin_audit/lib/Actions/UserManagement.php
@@ -55,9 +55,9 @@ class UserManagement extends Action {
 	 *
 	 * @param string $uid
 	 */
-	public function announce(string $uid) {
+	public function assign(string $uid) {
 		$this->log(
-		'UserID assgined: "%s"',
+		'UserID assigned: "%s"',
 			[ 'uid' => $uid ],
 			[ 'uid' ]
 		);
@@ -83,7 +83,7 @@ class UserManagement extends Action {
 	 *
 	 * @param string $uid
 	 */
-	public function revoke(string $uid) {
+	public function unassign(string $uid) {
 		$this->log(
 			'UserID unassigned: "%s"',
 			[ 'uid' => $uid ],
diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php
index 4f134ab308d..df39e3eb111 100644
--- a/apps/admin_audit/lib/AppInfo/Application.php
+++ b/apps/admin_audit/lib/AppInfo/Application.php
@@ -93,8 +93,8 @@ class Application extends App {
 		/** @var IUserSession|Session $userSession */
 		$userSession = $this->getContainer()->getServer()->getUserSession();
 		$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
-		$userSession->listen('\OC\User', 'announceUser', [$userActions, 'announce']);
-		$userSession->listen('\OC\User', 'postRevokeUser', [$userActions, 'revoke']);
+		$userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
+		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
 	}
 
 	protected function groupHooks(ILogger $logger)  {
diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php
index a887c6c4387..b1bd039c65e 100644
--- a/apps/dav/lib/HookManager.php
+++ b/apps/dav/lib/HookManager.php
@@ -77,22 +77,22 @@ class HookManager {
 			'post_createUser',
 			$this,
 			'postCreateUser');
-		\OC::$server->getUserManager()->listen('\OC\User', 'announceUser', function ($uid) {
+		\OC::$server->getUserManager()->listen('\OC\User', 'assignedUserId', function ($uid) {
 			$this->postCreateUser(['uid' => $uid]);
 		});
 		Util::connectHook('OC_User',
 			'pre_deleteUser',
 			$this,
 			'preDeleteUser');
-		\OC::$server->getUserManager()->listen('\OC\User', 'preRevokeUser', [$this, 'preRevokeUser']);
+		\OC::$server->getUserManager()->listen('\OC\User', 'preUnassignedUserId', [$this, 'preUnassignedUserId']);
 		Util::connectHook('OC_User',
 			'post_deleteUser',
 			$this,
 			'postDeleteUser');
-		\OC::$server->getUserManager()->listen('\OC\User', 'postRevokeUser', function ($uid) {
+		\OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', function ($uid) {
 			$this->postDeleteUser(['uid' => $uid]);
 		});
-		\OC::$server->getUserManager()->listen('\OC\User', 'postRevokeUser', [$this, 'postRevokeUser']);
+		\OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', [$this, 'postUnassignedUserId']);
 		Util::connectHook('OC_User',
 			'changeUser',
 			$this,
@@ -111,7 +111,7 @@ class HookManager {
 		$this->addressBooksToDelete = $this->cardDav->getUsersOwnAddressBooks('principals/users/' . $uid);
 	}
 
-	public function preRevokeUser($uid) {
+	public function preUnassignedUserId($uid) {
 		$this->usersToDelete[$uid] = $this->userManager->get($uid);
 	}
 
@@ -131,7 +131,7 @@ class HookManager {
 		}
 	}
 
-	public function postRevokeUser($uid) {
+	public function postUnassignedUserId($uid) {
 		if (isset($this->usersToDelete[$uid])){
 			$this->syncService->deleteUser($this->usersToDelete[$uid]);
 		}
diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php
index 009a491d349..8e2d63e3eb2 100644
--- a/apps/user_ldap/ajax/clearMappings.php
+++ b/apps/user_ldap/ajax/clearMappings.php
@@ -38,10 +38,10 @@ try {
 		$mapping = new UserMapping(\OC::$server->getDatabaseConnection());
 		$result = $mapping->clearCb(
 			function ($uid) {
-				\OC::$server->getUserManager()->emit('\OC\User', 'preRevokeUser', [$uid]);
+				\OC::$server->getUserManager()->emit('\OC\User', 'preUnassignedUserId', [$uid]);
 			},
 			function ($uid) {
-				\OC::$server->getUserManager()->emit('\OC\User', 'postRevokeUser', [$uid]);
+				\OC::$server->getUserManager()->emit('\OC\User', 'postUnassignedUserId', [$uid]);
 			}
 		);
 	} else if($subject === 'group') {
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index c9a7cd557a1..198fb478fed 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -609,7 +609,7 @@ class Access extends LDAPUtility implements IUserTools {
 			|| (!$isUser && !\OC::$server->getGroupManager()->groupExists($intName))) {
 			if($mapper->map($fdn, $intName, $uuid)) {
 				$this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL));
-				\OC::$server->getUserManager()->emit('\OC\User', 'announceUser', [$intName]);
+				\OC::$server->getUserManager()->emit('\OC\User', 'assignedUserId', [$intName]);
 				$newlyMapped = true;
 				return $intName;
 			}
@@ -618,7 +618,7 @@ class Access extends LDAPUtility implements IUserTools {
 
 		$altName = $this->createAltInternalOwnCloudName($intName, $isUser);
 		if(is_string($altName) && $mapper->map($fdn, $altName, $uuid)) {
-			\OC::$server->getUserManager()->emit('\OC\User', 'announceUser', [$intName]);
+			\OC::$server->getUserManager()->emit('\OC\User', 'assignedUserId', [$intName]);
 			$newlyMapped = true;
 			return $altName;
 		}
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index 3868645caec..e56e4675e39 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -396,7 +396,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 		\OC::$server->getLogger()->info('Cleaning up after user ' . $uid,
 			array('app' => 'user_ldap'));
 
-		$this->access->getUserMapper()->unmap($uid); // we don't emit revoke signals here, since it is implicit to delete signals fired from core
+		$this->access->getUserMapper()->unmap($uid); // we don't emit unassign signals here, since it is implicit to delete signals fired from core
 		$this->access->userManager->invalidate($uid);
 		return true;
 	}
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 85fe42c774f..b5054bd1851 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -50,9 +50,9 @@ use OCP\UserInterface;
  * - preCreateUser(string $uid, string $password)
  * - postCreateUser(\OC\User\User $user, string $password)
  * - change(\OC\User\User $user)
- * - announceUser(string $uid)
- * - preRevokeUser(string $uid)
- * - postRevokeUser(string $uid)
+ * - assignedUserId(string $uid)
+ * - preUnassignedUserId(string $uid)
+ * - postUnassignedUserId(string $uid)
  *
  * @package OC\User
  */
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 41149255819..5d8455fb5f7 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -72,9 +72,9 @@ use Symfony\Component\EventDispatcher\GenericEvent;
  * - postDelete(\OC\User\User $user)
  * - preCreateUser(string $uid, string $password)
  * - postCreateUser(\OC\User\User $user)
- * - announceUser(string $uid)
- * - preRevokeUser(string $uid)
- * - postRevokeUser(string $uid)
+ * - assignedUserId(string $uid)
+ * - preUnassignedUserId(string $uid)
+ * - postUnassignedUserId(string $uid)
  * - preLogin(string $user, string $password)
  * - postLogin(\OC\User\User $user, string $password)
  * - preRememberedLogin(string $uid)
diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php
index c8f59a95ccd..d20b4a3fa9a 100644
--- a/lib/public/IUserManager.php
+++ b/lib/public/IUserManager.php
@@ -40,9 +40,9 @@ namespace OCP;
  * - postDelete(\OC\User\User $user)
  * - preCreateUser(string $uid, string $password)
  * - postCreateUser(\OC\User\User $user, string $password)
- * - announceUser(string $uid)
- * - preRevokeUser(string $uid)
- * - postRevokeUser(string $uid)
+ * - assignedUserId(string $uid)
+ * - preUnassignedUserId(string $uid)
+ * - postUnassignedUserId(string $uid)
  *
  * @package OC\User
  * @since 8.0.0