CI/Test fixes for unified sharing

apps/sharing/tests/Command/CommandTest.php

@@ -33,6 +33,7 @@
 use OCP\Sharing\Permission\SharePermission;
 use OCP\Sharing\Property\ShareProperty;
 use OCP\Sharing\Recipient\ShareRecipient;
+use OCP\Sharing\Share;
 use OCP\Sharing\ShareAccessContext;
 use OCP\Sharing\ShareState;
 use OCP\Sharing\Source\ShareSource;
@@ -42,6 +43,9 @@
 use Symfony\Component\Console\Output\Output;
 use Test\Sharing\AbstractSharingManagerTests;
 
+/**
+ * @psalm-import-type SharingShare from Share
+ */
 #[Group(name: 'DB')]
 final class CommandTest extends AbstractSharingManagerTests {
 	/** @var list<class-string<SharingBase>> */
@@ -363,7 +367,7 @@ protected function deleteShare(ShareAccessContext $accessContext, string $id): v
 	}
 
 	/**
-	 * @return array<string, mixed>
+	 * @return SharingShare
 	 */
 	#[Override]
 	protected function getShare(ShareAccessContext $accessContext, string $id): array {
@@ -380,7 +384,7 @@ protected function getShare(ShareAccessContext $accessContext, string $id): arra
 	}
 
 	/**
-	 * @return array<string, mixed>
+	 * @return SharingShare[]
 	 */
 	#[Override]
 	protected function getShares(ShareAccessContext $accessContext, ?string $filterSourceTypeClass, ?string $filterSourceTypeValue, ?string $lastShareID, ?int $limit): array {

apps/sharing/tests/Controller/ApiV1ControllerTest.php

@@ -22,13 +22,18 @@
 use OCP\Sharing\Permission\SharePermission;
 use OCP\Sharing\Property\ShareProperty;
 use OCP\Sharing\Recipient\ShareRecipient;
+use OCP\Sharing\Share;
 use OCP\Sharing\ShareAccessContext;
 use OCP\Sharing\ShareState;
 use OCP\Sharing\Source\ShareSource;
 use PHPUnit\Framework\Attributes\Group;
 use Test\Sharing\AbstractSharingManagerTests;
 
 // TODO: Use Dispatcher
+
+/**
+ * @psalm-import-type SharingShare from Share
+ */
 #[Group(name: 'DB')]
 final class ApiV1ControllerTest extends AbstractSharingManagerTests {
 	public function testDefaultShareAccessContext(): void {
@@ -146,11 +151,17 @@ 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 {
 		return $this->executeRequest(new ShareAccessContext($accessContext->currentUser, null, [], $accessContext->overrideChecks), fn (ApiV1Controller $controller): DataResponse => $controller->getShare($id, $accessContext->secret, $accessContext->arguments));
 	}
 
+	/**
+	 * @psalm-suppress MixedReturnTypeCoercion
+	 */
 	#[Override]
 	protected function getShares(ShareAccessContext $accessContext, ?string $filterSourceTypeClass, ?string $filterSourceTypeValue, ?string $lastShareID, ?int $limit): array {
 		return $this->executeRequest($accessContext, function (ApiV1Controller $controller) use ($filterSourceTypeClass, $filterSourceTypeValue, $lastShareID, $limit): DataResponse {

core/Sharing/Property/ExpirationDateSharePropertyType.php

@@ -62,6 +62,7 @@ public function isRequired(Share $share): bool {
 		if ($this->hasRemoteRecipient($share) && $this->legacyManager->shareApiRemoteDefaultExpireDateEnforced()) {
 			return true;
 		}
+
 		return $this->hasLocalNonTokenAndEmailRecipient($share) && $this->legacyManager->shareApiInternalDefaultExpireDateEnforced();
 	}
 

tests/lib/Sharing/AbstractSharingManagerTests.php

@@ -35,6 +35,9 @@
 /**
  * @psalm-import-type SharingShare from Share
  * @psalm-import-type SharingRecipient from Share
+ *
+ * @psalm-suppress RedundantConditionGivenDocblockType
+ * @psalm-suppress PossiblyUndefinedArrayOffset
  */
 abstract class AbstractSharingManagerTests extends TestCase {
 	abstract protected function searchRecipients(ShareAccessContext $accessContext, ?array $filterRecipientTypeClasses, string $query, int $limit, int $offset, ?string $id = null): array;
@@ -61,8 +64,14 @@ abstract protected function selectSharePermissionPreset(ShareAccessContext $acce
 
 	abstract protected function deleteShare(ShareAccessContext $accessContext, string $id): void;
 
+	/**
+	 * @return SharingShare
+	 */
 	abstract protected function getShare(ShareAccessContext $accessContext, string $id): array;
 
+	/**
+	 * @return SharingShare[]
+	 */
 	abstract protected function getShares(ShareAccessContext $accessContext, ?string $filterSourceTypeClass, ?string $filterSourceTypeValue, ?string $lastShareID, ?int $limit): array;
 
 	protected IDBConnection $dbConnection;
@@ -3097,6 +3106,7 @@ public function testGetShareWithSecret(): void {
 		$this->assertGreaterThanOrEqual($before, $share['last_updated']);
 		$this->assertLessThanOrEqual($after, $share['last_updated']);
 
+		usort($share['recipients'], fn (array $a, array $b): int => $a['value'] <=> $b['value']);
 		$this->assertArrayHasKey('recipients', $share);
 		$this->assertIsArray($share['recipients']);
 		$this->assertCount(4, $share['recipients']);

tests/lib/Sharing/SharingManagerTest.php

@@ -207,9 +207,6 @@ protected function getShare(ShareAccessContext $accessContext, string $id): arra
 		}
 	}
 
-	/**
-	 * @return mixed[][]
-	 */
 	#[\Override]
 	protected function getShares(ShareAccessContext $accessContext, ?string $filterSourceTypeClass, ?string $filterSourceTypeValue, ?string $lastShareID, ?int $limit): array {
 		try {