chore: adapt psalm to use of OCA classes

Signed-off-by: grnd-alt <git@belakkaf.net>

Author: grnd-alt

lib/Activity/Filter.php

@@ -61,7 +61,7 @@ public function getIcon(): string {
 	 * @return string[] An array of allowed apps from which activities should be displayed
 	 * @since 11.0.0
 	 */
-	public function filterTypes(array $types): array {
+	public function filterTypes($types): array {
 		return array_merge($types, ['deck_comment']);
 	}
 

lib/Listeners/AclCreatedRemovedListener.php

@@ -33,6 +33,10 @@ public function handle(Event $event): void {
 			return;
 		}
 
+		if (!class_exists(UserShareAccessUpdatedEvent::class)) {
+			return;
+		}
+
 		$acl = $event->getAcl();
 		switch ($acl->getType()) {
 			case IShare::TYPE_GROUP:
@@ -42,6 +46,9 @@ public function handle(Event $event): void {
 				}
 				break;
 			case IShare::TYPE_CIRCLE:
+				if (!$this->circlesService->isCirclesEnabled()) {
+					return;
+				}
 				$circle = $this->circlesService->getCircle($acl->getParticipant());
 				$members = array_filter($circle->getInheritedMembers(), static function (Member $member) {
 					return $member->getUserType() === Member::TYPE_USER;

lib/Notification/NotificationHelper.php

@@ -107,7 +107,7 @@ public function sendCardDuedate(Card $card): void {
 				$notification = $this->notificationManager->createNotification();
 				$notification
 					->setApp('deck')
-					->setUser((string)$user->getUID())
+					->setUser($user->getUID())
 					->setObject('card', (string)$card->getId())
 					->setSubject('card-overdue', [
 						$card->getTitle(), $board->getTitle()

lib/Service/BoardService.php

@@ -239,11 +239,13 @@ public function delete(int $id): Board {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_DELETE);
 		$this->changeHelper->boardChanged($board->getId());
 
-		$acls = $this->aclMapper->findAll($id);
-		foreach ($acls as $acl) {
-			$user = new LazyUser($acl->getParticipant(), $this->userManager);
-			$event = new UserShareAccessUpdatedEvent($user);
-			$this->eventDispatcher->dispatchTyped($event);
+		if (class_exists(UserShareAccessUpdatedEvent::class)) {
+			$acls = $this->aclMapper->findAll($id);
+			foreach ($acls as $acl) {
+				$user = new LazyUser($acl->getParticipant(), $this->userManager);
+				$event = new UserShareAccessUpdatedEvent($user);
+				$this->eventDispatcher->dispatchTyped($event);
+			}
 		}
 
 		return $board;
@@ -264,11 +266,13 @@ public function deleteUndo(int $id): Board {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_RESTORE);
 		$this->changeHelper->boardChanged($board->getId());
 
-		$acls = $this->aclMapper->findAll($id);
-		foreach ($acls as $acl) {
-			$user = new LazyUser($acl->getParticipant(), $this->userManager);
-			$event = new UserShareAccessUpdatedEvent($user);
-			$this->eventDispatcher->dispatchTyped($event);
+		if (class_exists(UserShareAccessUpdatedEvent::class)) {
+			$acls = $this->aclMapper->findAll($id);
+			foreach ($acls as $acl) {
+				$user = new LazyUser($acl->getParticipant(), $this->userManager);
+				$event = new UserShareAccessUpdatedEvent($user);
+				$this->eventDispatcher->dispatchTyped($event);
+			}
 		}
 
 		return $board;

lib/Service/PermissionService.php

@@ -26,7 +26,9 @@
 use Psr\Log\LoggerInterface;
 
 class PermissionService {
-	private array $users = [];
+
+	/** @var array<string, array<string, User>> */
+	private $users = [];
 
 	private CappedMemoryCache $boardCache;
 	/** @var CappedMemoryCache<array<Acl::PERMISSION_*, bool>> */
@@ -207,8 +209,9 @@ public function userCan(array $acls, $permission, $userId = null) {
 	 * Required to allow assigning them to cards
 	 *
 	 * @param $boardId
-	 * @return User[]
-	 */
+	 * @param $refresh
+	 * @return array<string, User>
+	 * */
 	public function findUsers($boardId, $refresh = false) {
 		// cache users of a board so we don't query them for every cards
 		if (array_key_exists((string)$boardId, $this->users) && !$refresh) {
@@ -222,12 +225,12 @@ public function findUsers($boardId, $refresh = false) {
 		} catch (MultipleObjectsReturnedException $e) {
 			return [];
 		}
-
+		/** @var array<string, User> */
 		$users = [];
 		if (!$this->userManager->userExists($board->getOwner())) {
 			$this->logger->info('No owner found for board ' . $board->getId());
 		} else {
-			$users[$board->getOwner()] = new User($board->getOwner(), $this->userManager);
+			$users[(string)$board->getOwner()] = new User($board->getOwner(), $this->userManager);
 		}
 		$acls = $this->aclMapper->findAll($boardId);
 		/** @var Acl $acl */
@@ -237,7 +240,7 @@ public function findUsers($boardId, $refresh = false) {
 					$this->logger->info('No user found for acl rule ' . $acl->getId());
 					continue;
 				}
-				$users[$acl->getParticipant()] = new User($acl->getParticipant(), $this->userManager);
+				$users[(string)$acl->getParticipant()] = new User($acl->getParticipant(), $this->userManager);
 			}
 			if ($acl->getType() === Acl::PERMISSION_TYPE_GROUP) {
 				$group = $this->groupManager->get($acl->getParticipant());
@@ -246,7 +249,7 @@ public function findUsers($boardId, $refresh = false) {
 					continue;
 				}
 				foreach ($group->getUsers() as $user) {
-					$users[$user->getUID()] = new User($user->getUID(), $this->userManager);
+					$users[(string)$user->getUID()] = new User($user->getUID(), $this->userManager);
 				}
 			}
 
@@ -267,7 +270,7 @@ public function findUsers($boardId, $refresh = false) {
 						if ($user === null) {
 							$this->logger->info('No user found for circle member ' . $member->getUserId());
 						} else {
-							$users[$member->getUserId()] = new User($member->getUserId(), $this->userManager);
+							$users[(string)$member->getUserId()] = new User($member->getUserId(), $this->userManager);
 						}
 					}
 				} catch (\Exception $e) {

tests/psalm-baseline.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="6.5.0@38fc8444edf0cebc9205296ee6e30e906ade783b">
-  <file src="lib/Activity/Filter.php">
-    <MethodSignatureMismatch>
-      <code><![CDATA[$types]]></code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="lib/Controller/BoardApiController.php">
     <UndefinedFunction>
       <code><![CDATA[parseDate($modified)]]></code>

tests/stub.phpstub

@@ -44,6 +44,7 @@ namespace OCA\Circles\Model {
 		public const APP_DEFAULT = 11000;
 
 		public function getLevel(): int {}
+		public function getUserType(): int{}
 	}
 
 	class Circle {
@@ -85,6 +86,12 @@ namespace OCA\Circles {
 	}
 }
 
+namespace OCA\Files_Sharing\Event{
+	class UserShareAccessUpdatedEvent extends \OCP\EventDispatcher\Event{
+			public function __construct($user){}
+		}
+}
+
 namespace {
 
 	use OCP\IServerContainer;