nextcloud / server

settings/Controller/AuthSettingsController.php

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
 			return $this->getServiceNotAvailableResponse();
 		}
 
-		return array_map(function (IToken $token) use ($sessionToken) {
+		return array_map(function(IToken $token) use ($sessionToken) {
 			$data = $token->jsonSerialize();
 			if ($sessionToken->getId() === $token->getId()) {
 				$data['canDelete'] = false;

Indentation +198 added lines, -198 removed lines

@@ -45,226 +45,226 @@
 
 class AuthSettingsController extends Controller {
 
-	/** @var IProvider */
-	private $tokenProvider;
+    /** @var IProvider */
+    private $tokenProvider;
 
-	/** @var ISession */
-	private $session;
+    /** @var ISession */
+    private $session;
 
-	/** @var string */
-	private $uid;
+    /** @var string */
+    private $uid;
 
-	/** @var ISecureRandom */
-	private $random;
+    /** @var ISecureRandom */
+    private $random;
 
-	/** @var IManager */
-	private $activityManager;
+    /** @var IManager */
+    private $activityManager;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IProvider $tokenProvider
-	 * @param ISession $session
-	 * @param ISecureRandom $random
-	 * @param string|null $userId
-	 * @param IManager $activityManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IProvider $tokenProvider,
-								ISession $session,
-								ISecureRandom $random,
-								?string $userId,
-								IManager $activityManager,
-								ILogger $logger) {
-		parent::__construct($appName, $request);
-		$this->tokenProvider = $tokenProvider;
-		$this->uid = $userId;
-		$this->session = $session;
-		$this->random = $random;
-		$this->activityManager = $activityManager;
-		$this->logger = $logger;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IProvider $tokenProvider
+     * @param ISession $session
+     * @param ISecureRandom $random
+     * @param string|null $userId
+     * @param IManager $activityManager
+     * @param ILogger $logger
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IProvider $tokenProvider,
+                                ISession $session,
+                                ISecureRandom $random,
+                                ?string $userId,
+                                IManager $activityManager,
+                                ILogger $logger) {
+        parent::__construct($appName, $request);
+        $this->tokenProvider = $tokenProvider;
+        $this->uid = $userId;
+        $this->session = $session;
+        $this->random = $random;
+        $this->activityManager = $activityManager;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 *
-	 * @return JSONResponse|array
-	 */
-	public function index() {
-		$tokens = $this->tokenProvider->getTokenByUser($this->uid);
+    /**
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     *
+     * @return JSONResponse|array
+     */
+    public function index() {
+        $tokens = $this->tokenProvider->getTokenByUser($this->uid);
 
-		try {
-			$sessionId = $this->session->getId();
-		} catch (SessionNotAvailableException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
-		try {
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
-		} catch (InvalidTokenException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
+        try {
+            $sessionId = $this->session->getId();
+        } catch (SessionNotAvailableException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
+        try {
+            $sessionToken = $this->tokenProvider->getToken($sessionId);
+        } catch (InvalidTokenException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
 
-		return array_map(function (IToken $token) use ($sessionToken) {
-			$data = $token->jsonSerialize();
-			if ($sessionToken->getId() === $token->getId()) {
-				$data['canDelete'] = false;
-				$data['current'] = true;
-			} else {
-				$data['canDelete'] = true;
-			}
-			return $data;
-		}, $tokens);
-	}
+        return array_map(function (IToken $token) use ($sessionToken) {
+            $data = $token->jsonSerialize();
+            if ($sessionToken->getId() === $token->getId()) {
+                $data['canDelete'] = false;
+                $data['current'] = true;
+            } else {
+                $data['canDelete'] = true;
+            }
+            return $data;
+        }, $tokens);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $name
-	 * @return JSONResponse
-	 */
-	public function create($name) {
-		try {
-			$sessionId = $this->session->getId();
-		} catch (SessionNotAvailableException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
+    /**
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @param string $name
+     * @return JSONResponse
+     */
+    public function create($name) {
+        try {
+            $sessionId = $this->session->getId();
+        } catch (SessionNotAvailableException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
 
-		try {
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
-			$loginName = $sessionToken->getLoginName();
-			try {
-				$password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
-			} catch (PasswordlessTokenException $ex) {
-				$password = null;
-			}
-		} catch (InvalidTokenException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
+        try {
+            $sessionToken = $this->tokenProvider->getToken($sessionId);
+            $loginName = $sessionToken->getLoginName();
+            try {
+                $password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
+            } catch (PasswordlessTokenException $ex) {
+                $password = null;
+            }
+        } catch (InvalidTokenException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
 
-		$token = $this->generateRandomDeviceToken();
-		$deviceToken = $this->tokenProvider->generateToken($token, $this->uid, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
-		$tokenData = $deviceToken->jsonSerialize();
-		$tokenData['canDelete'] = true;
+        $token = $this->generateRandomDeviceToken();
+        $deviceToken = $this->tokenProvider->generateToken($token, $this->uid, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
+        $tokenData = $deviceToken->jsonSerialize();
+        $tokenData['canDelete'] = true;
 
-		$this->publishActivity(Provider::APP_TOKEN_CREATED, $deviceToken->getId(), $deviceToken->getName());
+        $this->publishActivity(Provider::APP_TOKEN_CREATED, $deviceToken->getId(), $deviceToken->getName());
 
-		return new JSONResponse([
-			'token' => $token,
-			'loginName' => $loginName,
-			'deviceToken' => $tokenData,
-		]);
-	}
+        return new JSONResponse([
+            'token' => $token,
+            'loginName' => $loginName,
+            'deviceToken' => $tokenData,
+        ]);
+    }
 
-	/**
-	 * @return JSONResponse
-	 */
-	private function getServiceNotAvailableResponse() {
-		$resp = new JSONResponse();
-		$resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
-		return $resp;
-	}
+    /**
+     * @return JSONResponse
+     */
+    private function getServiceNotAvailableResponse() {
+        $resp = new JSONResponse();
+        $resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
+        return $resp;
+    }
 
-	/**
-	 * Return a 25 digit device password
-	 *
-	 * Example: AbCdE-fGhJk-MnPqR-sTwXy-23456
-	 *
-	 * @return string
-	 */
-	private function generateRandomDeviceToken() {
-		$groups = [];
-		for ($i = 0; $i < 5; $i++) {
-			$groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
-		}
-		return implode('-', $groups);
-	}
+    /**
+     * Return a 25 digit device password
+     *
+     * Example: AbCdE-fGhJk-MnPqR-sTwXy-23456
+     *
+     * @return string
+     */
+    private function generateRandomDeviceToken() {
+        $groups = [];
+        for ($i = 0; $i < 5; $i++) {
+            $groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
+        }
+        return implode('-', $groups);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 *
-	 * @param int $id
-	 * @return array|JSONResponse
-	 */
-	public function destroy($id) {
-		try {
-			$token = $this->findTokenByIdAndUser($id);
-		} catch (InvalidTokenException $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     *
+     * @param int $id
+     * @return array|JSONResponse
+     */
+    public function destroy($id) {
+        try {
+            $token = $this->findTokenByIdAndUser($id);
+        } catch (InvalidTokenException $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		$this->tokenProvider->invalidateTokenById($this->uid, $token->getId());
-		$this->publishActivity(Provider::APP_TOKEN_DELETED, $token->getId(), $token->getName());
-		return [];
-	}
+        $this->tokenProvider->invalidateTokenById($this->uid, $token->getId());
+        $this->publishActivity(Provider::APP_TOKEN_DELETED, $token->getId(), $token->getName());
+        return [];
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 *
-	 * @param int $id
-	 * @param array $scope
-	 * @return array|JSONResponse
-	 */
-	public function update($id, array $scope) {
-		try {
-			$token = $this->findTokenByIdAndUser($id);
-		} catch (InvalidTokenException $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     *
+     * @param int $id
+     * @param array $scope
+     * @return array|JSONResponse
+     */
+    public function update($id, array $scope) {
+        try {
+            $token = $this->findTokenByIdAndUser($id);
+        } catch (InvalidTokenException $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		$token->setScope([
-			'filesystem' => $scope['filesystem']
-		]);
+        $token->setScope([
+            'filesystem' => $scope['filesystem']
+        ]);
 
-		$this->tokenProvider->updateToken($token);
-		$this->publishActivity(Provider::APP_TOKEN_UPDATED, $token->getId(), $token->getName());
-		return [];
-	}
+        $this->tokenProvider->updateToken($token);
+        $this->publishActivity(Provider::APP_TOKEN_UPDATED, $token->getId(), $token->getName());
+        return [];
+    }
 
-	/**
-	 * @param string $subject
-	 * @param int $id
-	 * @param string|null $tokenName
-	 */
-	private function publishActivity(string $subject, int $id, ?string $tokenName = null): void {
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('security')
-			->setAffectedUser($this->uid)
-			->setAuthor($this->uid)
-			->setSubject($subject, [$tokenName])
-			->setObject('app_token', $id, 'App Password');
+    /**
+     * @param string $subject
+     * @param int $id
+     * @param string|null $tokenName
+     */
+    private function publishActivity(string $subject, int $id, ?string $tokenName = null): void {
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('security')
+            ->setAffectedUser($this->uid)
+            ->setAuthor($this->uid)
+            ->setSubject($subject, [$tokenName])
+            ->setObject('app_token', $id, 'App Password');
 
-		try {
-			$this->activityManager->publish($event);
-		} catch (BadMethodCallException $e) {
-			$this->logger->warning('could not publish activity');
-			$this->logger->logException($e);
-		}
-	}
+        try {
+            $this->activityManager->publish($event);
+        } catch (BadMethodCallException $e) {
+            $this->logger->warning('could not publish activity');
+            $this->logger->logException($e);
+        }
+    }
 
-	/**
-	 * Find a token by given id and check if uid for current session belongs to this token
-	 *
-	 * @param int $id
-	 * @return IToken
-	 * @throws InvalidTokenException
-	 * @throws \OC\Authentication\Exceptions\ExpiredTokenException
-	 */
-	private function findTokenByIdAndUser(int $id): IToken {
-		$token = $this->tokenProvider->getTokenById($id);
-		if ($token->getUID() !== $this->uid) {
-			throw new InvalidTokenException('This token does not belong to you!');
-		}
-		return $token;
-	}
+    /**
+     * Find a token by given id and check if uid for current session belongs to this token
+     *
+     * @param int $id
+     * @return IToken
+     * @throws InvalidTokenException
+     * @throws \OC\Authentication\Exceptions\ExpiredTokenException
+     */
+    private function findTokenByIdAndUser(int $id): IToken {
+        $token = $this->tokenProvider->getTokenById($id);
+        if ($token->getUID() !== $this->uid) {
+            throw new InvalidTokenException('This token does not belong to you!');
+        }
+        return $token;
+    }
 }

settings/Activity/Provider.php

Indentation +162 added lines, -162 removed lines

@@ -35,166 +35,166 @@
 
 class Provider implements IProvider {
 
-	public const PASSWORD_CHANGED_BY = 'password_changed_by';
-	public const PASSWORD_CHANGED_SELF = 'password_changed_self';
-	public const PASSWORD_RESET = 'password_changed';
-	public const EMAIL_CHANGED_BY = 'email_changed_by';
-	public const EMAIL_CHANGED_SELF = 'email_changed_self';
-	public const EMAIL_CHANGED = 'email_changed';
-	public const APP_TOKEN_CREATED = 'app_token_created';
-	public const APP_TOKEN_UPDATED = 'app_token_updated';
-	public const APP_TOKEN_DELETED = 'app_token_deleted';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	private $activityManager;
-
-	/** @var string[] cached displayNames - key is the UID and value the displayname */
-	protected $displayNames = [];
-
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IUserManager $userManager,
-								IManager $activityManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->userManager = $userManager;
-		$this->activityManager = $activityManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
-		if ($event->getApp() !== 'settings') {
-			throw new \InvalidArgumentException('Unknown app');
-		}
-
-		$this->l = $this->languageFactory->get('settings', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
-		}
-
-		if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your password');
-		} else if ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your password');
-		} else if ($event->getSubject() === self::PASSWORD_RESET) {
-			$subject = $this->l->t('Your password was reset by an administrator');
-
-		} else if ($event->getSubject() === self::EMAIL_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your email address');
-		} else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your email address');
-		} else if ($event->getSubject() === self::EMAIL_CHANGED) {
-			$subject = $this->l->t('Your email address was changed by an administrator');
-
-		} else if ($event->getSubject() === self::APP_TOKEN_CREATED) {
-			$subject = $this->l->t('You created app password "{token}"');
-		} else if ($event->getSubject() === self::APP_TOKEN_UPDATED) {
-			$subject = $this->l->t('You updated app password "{token}"');
-		} else if ($event->getSubject() === self::APP_TOKEN_DELETED) {
-			$subject = $this->l->t('You deleted app password "{token}"');
-
-		} else {
-			throw new \InvalidArgumentException('Unknown subject');
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParameters(IEvent $event): array {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::PASSWORD_CHANGED_SELF:
-			case self::PASSWORD_RESET:
-			case self::EMAIL_CHANGED_SELF:
-			case self::EMAIL_CHANGED:
-				return [];
-			case self::PASSWORD_CHANGED_BY:
-			case self::EMAIL_CHANGED_BY:
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-				];
-			case self::APP_TOKEN_CREATED:
-			case self::APP_TOKEN_UPDATED:
-			case self::APP_TOKEN_DELETED:
-				return [
-					'token' => [
-						'type' => 'highlight',
-						'id' => $event->getObjectId(),
-						'name' => $parameters[0],
-					]
-				];
-		}
-
-		throw new \InvalidArgumentException('Unknown subject');
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	protected function generateUserParameter(string $uid): array {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	protected function getDisplayName(string $uid): string {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		}
-
-		return $uid;
-	}
+    public const PASSWORD_CHANGED_BY = 'password_changed_by';
+    public const PASSWORD_CHANGED_SELF = 'password_changed_self';
+    public const PASSWORD_RESET = 'password_changed';
+    public const EMAIL_CHANGED_BY = 'email_changed_by';
+    public const EMAIL_CHANGED_SELF = 'email_changed_self';
+    public const EMAIL_CHANGED = 'email_changed';
+    public const APP_TOKEN_CREATED = 'app_token_created';
+    public const APP_TOKEN_UPDATED = 'app_token_updated';
+    public const APP_TOKEN_DELETED = 'app_token_deleted';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    private $activityManager;
+
+    /** @var string[] cached displayNames - key is the UID and value the displayname */
+    protected $displayNames = [];
+
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IUserManager $userManager,
+                                IManager $activityManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->userManager = $userManager;
+        $this->activityManager = $activityManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
+        if ($event->getApp() !== 'settings') {
+            throw new \InvalidArgumentException('Unknown app');
+        }
+
+        $this->l = $this->languageFactory->get('settings', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
+        }
+
+        if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your password');
+        } else if ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your password');
+        } else if ($event->getSubject() === self::PASSWORD_RESET) {
+            $subject = $this->l->t('Your password was reset by an administrator');
+
+        } else if ($event->getSubject() === self::EMAIL_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your email address');
+        } else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your email address');
+        } else if ($event->getSubject() === self::EMAIL_CHANGED) {
+            $subject = $this->l->t('Your email address was changed by an administrator');
+
+        } else if ($event->getSubject() === self::APP_TOKEN_CREATED) {
+            $subject = $this->l->t('You created app password "{token}"');
+        } else if ($event->getSubject() === self::APP_TOKEN_UPDATED) {
+            $subject = $this->l->t('You updated app password "{token}"');
+        } else if ($event->getSubject() === self::APP_TOKEN_DELETED) {
+            $subject = $this->l->t('You deleted app password "{token}"');
+
+        } else {
+            throw new \InvalidArgumentException('Unknown subject');
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParameters(IEvent $event): array {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::PASSWORD_CHANGED_SELF:
+            case self::PASSWORD_RESET:
+            case self::EMAIL_CHANGED_SELF:
+            case self::EMAIL_CHANGED:
+                return [];
+            case self::PASSWORD_CHANGED_BY:
+            case self::EMAIL_CHANGED_BY:
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                ];
+            case self::APP_TOKEN_CREATED:
+            case self::APP_TOKEN_UPDATED:
+            case self::APP_TOKEN_DELETED:
+                return [
+                    'token' => [
+                        'type' => 'highlight',
+                        'id' => $event->getObjectId(),
+                        'name' => $parameters[0],
+                    ]
+                ];
+        }
+
+        throw new \InvalidArgumentException('Unknown subject');
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    protected function generateUserParameter(string $uid): array {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    protected function getDisplayName(string $uid): string {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        }
+
+        return $uid;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			$replacements[] = $parameter['name'];
 		}