Merge pull request #29435 from nextcloud/explicitly-name-profile-link…

…-action
nextcloud · Oct 26, 2021 · 1b366a0 · 1b366a0
2 parents f9629c0 + 9f8eae3
commit 1b366a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php
@@ -63,7 +63,7 @@ class RegistrationContext {
 	private $dashboardPanels = [];
 
 	/** @var ServiceRegistration<ILinkAction>[] */
-	private $profileActions = [];
+	private $profileLinkActions = [];
 
 	/** @var ServiceFactoryRegistration[] */
 	private $services = [];
@@ -253,8 +253,8 @@ public function registerCalendarProvider(string $class): void {
 				);
 			}
 
-			public function registerProfileAction(string $actionClass): void {
-				$this->context->registerProfileAction(
+			public function registerProfileLinkAction(string $actionClass): void {
+				$this->context->registerProfileLinkAction(
 					$this->appId,
 					$actionClass
 				);
@@ -343,10 +343,10 @@ public function registerCalendarProvider(string $appId, string $class): void {
 	}
 
 	/**
-	 * @psalm-param class-string<ILinkAction> $capability
+	 * @psalm-param class-string<ILinkAction> $actionClass
 	 */
-	public function registerProfileAction(string $appId, string $actionClass): void {
-		$this->profileActions[] = new ServiceRegistration($appId, $actionClass);
+	public function registerProfileLinkAction(string $appId, string $actionClass): void {
+		$this->profileLinkActions[] = new ServiceRegistration($appId, $actionClass);
 	}
 
 	/**
@@ -597,7 +597,7 @@ public function getCalendarProviders(): array {
 	/**
 	 * @return ServiceRegistration<ILinkAction>[]
 	 */
-	public function getProfileActions(): array {
-		return $this->profileActions;
+	public function getProfileLinkActions(): array {
+		return $this->profileLinkActions;
 	}
 }
diff --git a/lib/private/Profile/ProfileManager.php b/lib/private/Profile/ProfileManager.php
@@ -168,7 +168,7 @@ private function getActions(IUser $targetUser, ?IUser $visitingUser): array {
 			$this->registerAction($targetUser, $visitingUser, $provider);
 		}
 
-		foreach ($context->getProfileActions() as $registration) {
+		foreach ($context->getProfileLinkActions() as $registration) {
 			/** @var ILinkAction $provider */
 			$provider = $this->container->get($registration->getService());
 			$this->registerAction($targetUser, $visitingUser, $provider);

diff --git a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
@@ -255,12 +255,12 @@ public function registerCalendarProvider(string $class): void;
 
 	/**
 	 * Register an implementation of \OCP\Profile\ILinkAction that
-	 * will handle the implementation of a profile action
+	 * will handle the implementation of a profile link action
 	 *
 	 * @param string $actionClass
 	 * @psalm-param class-string<\OCP\Profile\ILinkAction> $actionClass
 	 * @return void
 	 * @since 23.0.0
 	 */
-	public function registerProfileAction(string $actionClass): void;
+	public function registerProfileLinkAction(string $actionClass): void;
 }