chore(sharing): Improve typing in tests to please psalm:strict

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

apps/sharing/tests/Controller/ApiV1ControllerTest.php

@@ -95,53 +95,63 @@ protected function searchRecipients(ShareAccessContext $accessContext, ?array $f
 
 	#[Override]
 	protected function createShare(ShareAccessContext $accessContext): array {
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->createShare());
 	}
 
 	#[Override]
 	protected function updateShareState(ShareAccessContext $accessContext, string $id, ShareState $state): array {
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->updateShareState($id, $state->value));
 	}
 
 	#[Override]
 	protected function addShareSource(ShareAccessContext $accessContext, string $id, ShareSource $source): array {
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->addShareSource($id, $source->class, $source->value));
 	}
 
 	#[Override]
 	protected function removeShareSource(ShareAccessContext $accessContext, string $id, ShareSource $source): array {
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->removeShareSource($id, $source->class, $source->value));
 	}
 
 	#[Override]
 	protected function addShareRecipient(ShareAccessContext $accessContext, string $id, ShareRecipient $recipient): array {
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->addShareRecipient($id, $recipient->class, $recipient->value, $recipient->instance));
 	}
 
 	#[Override]
 	protected function removeShareRecipient(ShareAccessContext $accessContext, string $id, ShareRecipient $recipient): array {
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->removeShareRecipient($id, $recipient->class, $recipient->value, $recipient->instance));
 	}
 
 	#[Override]
 	protected function updateShareRecipientSecret(ShareAccessContext $accessContext, string $id, ShareRecipient $recipient, string $secret): array {
 		/** @psalm-suppress ArgumentTypeCoercion */
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->updateShareRecipientSecret($id, $recipient->class, $recipient->value, $recipient->instance, $secret));
 	}
 
 	#[Override]
 	protected function updateShareProperty(ShareAccessContext $accessContext, string $id, ShareProperty $property): array {
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->updateShareProperty($id, $property->class, $property->value));
 	}
 
 	#[Override]
 	protected function updateSharePermission(ShareAccessContext $accessContext, string $id, SharePermission $permission): array {
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->updateSharePermission($id, $permission->class, $permission->enabled));
 	}
 
 	#[Override]
 	protected function selectSharePermissionPreset(ShareAccessContext $accessContext, string $id, string $permissionPresetClass): array {
 		/** @psalm-suppress ArgumentTypeCoercion */
+		/** @var SharingShare */
 		return $this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->selectSharePermissionPreset($id, $permissionPresetClass));
 	}
 
@@ -150,11 +160,9 @@ protected function deleteShare(ShareAccessContext $accessContext, string $id): v
 		$this->executeRequest($accessContext, fn (ApiV1Controller $controller): DataResponse => $controller->deleteShare($id));
 	}
 
-	/**
-	 * @psalm-suppress MixedReturnTypeCoercion
-	 */
 	#[Override]
 	protected function getShare(ShareAccessContext $accessContext, string $id): array {
+		/** @var SharingShare */
 		return $this->executeRequest(new ShareAccessContext($accessContext->currentUser, null, [], $accessContext->overrideChecks), fn (ApiV1Controller $controller): DataResponse => $controller->getShare($id, $accessContext->secret, $accessContext->arguments));
 	}
 

tests/lib/Sharing/AbstractSharingManagerTests.php

@@ -42,24 +42,54 @@
 abstract class AbstractSharingManagerTests extends TestCase {
 	abstract protected function searchRecipients(ShareAccessContext $accessContext, ?array $filterRecipientTypeClasses, string $query, int $limit, int $offset, ?string $id = null): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function createShare(ShareAccessContext $accessContext): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function updateShareState(ShareAccessContext $accessContext, string $id, ShareState $state): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function addShareSource(ShareAccessContext $accessContext, string $id, ShareSource $source): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function removeShareSource(ShareAccessContext $accessContext, string $id, ShareSource $source): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function addShareRecipient(ShareAccessContext $accessContext, string $id, ShareRecipient $recipient): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function removeShareRecipient(ShareAccessContext $accessContext, string $id, ShareRecipient $recipient): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function updateShareRecipientSecret(ShareAccessContext $accessContext, string $id, ShareRecipient $recipient, string $secret): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function updateShareProperty(ShareAccessContext $accessContext, string $id, ShareProperty $property): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function updateSharePermission(ShareAccessContext $accessContext, string $id, SharePermission $permission): array;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function selectSharePermissionPreset(ShareAccessContext $accessContext, string $id, string $permissionPresetClass): array;
 
 	abstract protected function deleteShare(ShareAccessContext $accessContext, string $id): void;
@@ -86,7 +116,7 @@ abstract protected function getShares(ShareAccessContext $accessContext, ?string
 
 	protected IUser $user2;
 
-	private function parseTime(mixed $timestampMs): \DateTimeImmutable {
+	private function parseTime(string $timestampMs): \DateTimeImmutable {
 		$time = \DateTimeImmutable::createFromFormat('U.u', number_format((float)$timestampMs / 1000.0, 3, '.', ''));
 		if ($time === false) {
 			throw new \RuntimeException('invalid timestamp: ' . $timestampMs);