Bump psalm error level and fix issues spotted by psalm

lib/Controller/CollectiveController.php

@@ -14,6 +14,7 @@
 use OCA\Collectives\Db\Collective;
 use OCA\Collectives\Fs\NodeHelper;
 use OCA\Collectives\Service\CollectiveService;
+use OCA\Collectives\Service\NotFoundException;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
@@ -38,8 +39,15 @@ public function __construct(
 		parent::__construct($AppName, $request);
 	}
 
+	/**
+	 * @throws NotFoundException
+	 */
 	private function getUserId(): string {
-		return $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
+		if ($user === null) {
+			throw new NotFoundException('Session user not found');
+		}
+		return $user->getUID();
 	}
 
 	private function getUserLang(): string {

lib/Controller/CollectiveUserSettingsController.php

@@ -12,6 +12,7 @@
 use Closure;
 
 use OCA\Collectives\Service\CollectiveUserSettingsService;
+use OCA\Collectives\Service\NotFoundException;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
@@ -32,8 +33,15 @@ public function __construct(
 		parent::__construct($AppName, $request);
 	}
 
+	/**
+	 * @throws NotFoundException
+	 */
 	private function getUserId(): string {
-		return $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
+		if ($user === null) {
+			throw new NotFoundException('Session user not found');
+		}
+		return $user->getUID();
 	}
 
 	private function prepareResponse(Closure $callback) : DataResponse {

lib/Controller/PageController.php

@@ -11,6 +11,7 @@
 
 use OCA\Collectives\Service\AttachmentService;
 use OCA\Collectives\Service\CollectiveService;
+use OCA\Collectives\Service\NotFoundException;
 use OCA\Collectives\Service\PageService;
 use OCA\Collectives\Service\SearchService;
 use OCP\AppFramework\Controller;
@@ -36,8 +37,15 @@ public function __construct(
 		parent::__construct($appName, $request);
 	}
 
+	/**
+	 * @throws NotFoundException
+	 */
 	private function getUserId(): string {
-		return $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
+		if ($user === null) {
+			throw new NotFoundException('Session user not found');
+		}
+		return $user->getUID();
 	}
 
 	#[NoAdminRequired]
@@ -103,6 +111,7 @@ public function contentSearch(int $collectiveId, string $searchString): DataResp
 
 	#[NoAdminRequired]
 	public function moveOrCopy(int $collectiveId, int $id, ?int $parentId = null, ?string $title = null, ?int $index = 0, bool $copy = false): DataResponse {
+		$index = $index ?? 0;
 		return $this->handleErrorResponse(function () use ($collectiveId, $id, $parentId, $title, $index, $copy): array {
 			$userId = $this->getUserId();
 			$pageInfo = $copy
@@ -116,6 +125,7 @@ public function moveOrCopy(int $collectiveId, int $id, ?int $parentId = null, ?s
 
 	#[NoAdminRequired]
 	public function moveOrCopyToCollective(int $collectiveId, int $id, int $newCollectiveId, ?int $parentId = null, ?int $index = 0, bool $copy = false): DataResponse {
+		$index = $index ?? 0;
 		return $this->handleErrorResponse(function () use ($collectiveId, $id, $newCollectiveId, $parentId, $index, $copy): array {
 			$userId = $this->getUserId();
 			if ($copy) {

lib/Controller/PageTrashController.php

@@ -9,6 +9,7 @@
 
 namespace OCA\Collectives\Controller;
 
+use OCA\Collectives\Service\NotFoundException;
 use OCA\Collectives\Service\PageService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
@@ -33,8 +34,15 @@ public function __construct(
 		$this->userSession = $userSession;
 	}
 
+	/**
+	 * @throws NotFoundException
+	 */
 	private function getUserId(): string {
-		return $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
+		if ($user === null) {
+			throw new NotFoundException('Session user not found');
+		}
+		return $user->getUID();
 	}
 
 	#[NoAdminRequired]

lib/Controller/PublicPageController.php

@@ -210,6 +210,7 @@ public function touch(int $id): DataResponse {
 	#[PublicPage]
 	#[AnonRateLimit(limit: 10, period: 10)]
 	public function moveOrCopy(int $id, ?int $parentId, ?string $title = null, ?int $index = 0, bool $copy = false): DataResponse {
+		$index = $index ?? 0;
 		return $this->handleErrorResponse(function () use ($id, $parentId, $title, $index, $copy): array {
 			$this->checkEditPermissions();
 			$owner = $this->getCollectiveShare()->getOwner();

lib/Controller/SessionController.php

@@ -10,6 +10,7 @@
 namespace OCA\Collectives\Controller;
 
 use Closure;
+use OCA\Collectives\Service\NotFoundException;
 use OCA\Collectives\Service\SessionService;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
@@ -31,8 +32,15 @@ public function __construct(
 		parent::__construct($appName, $request);
 	}
 
+	/**
+	 * @throws NotFoundException
+	 */
 	private function getUserId(): string {
-		return $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
+		if ($user === null) {
+			throw new NotFoundException('Session user not found');
+		}
+		return $user->getUID();
 	}
 
 	private function prepareResponse(Closure $callback) : DataResponse {

lib/Controller/SettingsController.php

@@ -75,7 +75,7 @@ public function getUserSetting(string $key): DataResponse {
 	}
 
 	#[NoAdminRequired]
-	public function setUserSetting(string $key, ?string $value): DataResponse {
+	public function setUserSetting(string $key, string $value): DataResponse {
 		return $this->prepareResponse(function () use ($key, $value): ?string {
 			$this->validateSetUserSetting($key, $value);
 			$this->config->setUserValue($this->userId, 'collectives', $key, $value);

lib/Controller/ShareController.php

@@ -13,6 +13,7 @@
 
 use OCA\Collectives\Service\CollectiveService;
 use OCA\Collectives\Service\CollectiveShareService;
+use OCA\Collectives\Service\NotFoundException;
 use OCA\Collectives\Service\PageService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
@@ -36,8 +37,15 @@ public function __construct(
 		parent::__construct($AppName, $request);
 	}
 
+	/**
+	 * @throws NotFoundException
+	 */
 	private function getUserId(): string {
-		return $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
+		if ($user === null) {
+			throw new NotFoundException('Session user not found');
+		}
+		return $user->getUID();
 	}
 
 	private function prepareResponse(Closure $callback) : DataResponse {

lib/Controller/TemplateController.php

@@ -9,6 +9,7 @@
 
 namespace OCA\Collectives\Controller;
 
+use OCA\Collectives\Service\NotFoundException;
 use OCA\Collectives\Service\TemplateService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
@@ -30,8 +31,15 @@ public function __construct(
 		parent::__construct($appName, $request);
 	}
 
+	/**
+	 * @throws NotFoundException
+	 */
 	private function getUserId(): string {
-		return $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
+		if ($user === null) {
+			throw new NotFoundException('Session user not found');
+		}
+		return $user->getUID();
 	}
 
 	#[NoAdminRequired]

lib/Controller/TrashController.php

@@ -10,6 +10,7 @@
 namespace OCA\Collectives\Controller;
 
 use OCA\Collectives\Service\CollectiveService;
+use OCA\Collectives\Service\NotFoundException;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
@@ -30,8 +31,15 @@ public function __construct(
 		parent::__construct($AppName, $request);
 	}
 
+	/**
+	 * @throws NotFoundException
+	 */
 	private function getUserId(): string {
-		return $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
+		if ($user === null) {
+			throw new NotFoundException('Session user not found');
+		}
+		return $user->getUID();
 	}
 
 	#[NoAdminRequired]

lib/Db/Collective.php

@@ -75,9 +75,9 @@ class Collective extends Entity implements JsonSerializable {
 	protected bool $userShowMembers = Collective::defaultShowMembers;
 	protected bool $userShowRecentPages = Collective::defaultShowRecentPages;
 	protected array $userFavoritePages = [];
-	protected ?bool $canLeave = null;
+	protected bool $canLeave = false;
 
-	public function getCircleId(): ?string {
+	public function getCircleId(): string {
 		return $this->getCircleUniqueId();
 	}
 
@@ -200,11 +200,11 @@ public function getUserFavoritePages(): array {
 		return $this->userFavoritePages;
 	}
 
-	public function getCanLeave(): ?bool {
+	public function getCanLeave(): bool {
 		return $this->canLeave;
 	}
 
-	public function setCanLeave(?bool $canLeave): void {
+	public function setCanLeave(bool $canLeave): void {
 		$this->canLeave = $canLeave;
 	}
 

lib/Db/CollectiveMapper.php

@@ -15,18 +15,17 @@
 use OCA\Collectives\Service\NotFoundException;
 use OCA\Collectives\Service\NotPermittedException;
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\Exception;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 /**
- * @method Collective insert(Entity $collective)
- * @method Collective delete(Entity $collective)
+ * @method Collective insert(Collective $collective)
+ * @method Collective delete(Collective $collective)
  * @method Collective findEntity(IQueryBuilder $query)
- * @method Collective update(Entity $collective)
+ * @method Collective update(Collective $collective)
  * @template-extends QBMapper<Collective>
  */
 class CollectiveMapper extends QBMapper {

lib/Db/CollectiveShareMapper.php

@@ -28,6 +28,9 @@ public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'collectives_shares', CollectiveShare::class);
 	}
 
+	/**
+	 * @return CollectiveShare[]
+	 */
 	public function findByCollectiveId(int $collectiveId): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
@@ -39,6 +42,7 @@ public function findByCollectiveId(int $collectiveId): array {
 	}
 
 	/**
+	 * @return CollectiveShare[]
 	 * @throws Exception
 	 */
 	public function findByCollectiveIdAndUser(int $collectiveId, string $userId): array {

lib/Db/CollectiveUserSettings.php

@@ -36,7 +36,7 @@ class CollectiveUserSettings extends Entity implements JsonSerializable {
 	protected ?int $collectiveId = null;
 	protected ?string $userId = null;
 	protected int $pageOrder = Collective::defaultPageOrder;
-	protected ?string $settings = '{}';
+	protected string $settings = '{}';
 
 	/**
 	 * @throws NotPermittedException
@@ -52,7 +52,7 @@ private static function checkSetting(string $setting): void {
 	 * @throws NotPermittedException
 	 * @throws JsonException
 	 */
-	public function getSetting(string $setting) {
+	public function getSetting(string $setting): mixed {
 		self::checkSetting($setting);
 		return json_decode($this->settings, true, 512, JSON_THROW_ON_ERROR)[$setting] ?? null;
 	}

lib/Db/CollectiveUserSettingsMapper.php

@@ -31,12 +31,9 @@ public function __construct(IDBConnection $db) {
 	 * Provide our own implementation of `insertOrUpdate` as the one from QBMapper throws
 	 * `REASON_NOT_NULL_CONSTRAINT_VIOLATION` for existing entities.
 	 *
-	 * TODO: Migrate to using `CollectiveUserSettings` in type hints once we drop PHP7.3.
-	 *
-	 * @return CollectiveUserSettings
 	 * @throws Exception
 	 */
-	public function insertOrUpdate(Entity $entity): Entity {
+	public function insertOrUpdate(CollectiveUserSettings|Entity $entity): CollectiveUserSettings {
 		if ($entity->getId() === null) {
 			return $this->insert($entity);
 		}

lib/Db/PageMapper.php

@@ -10,22 +10,21 @@
 namespace OCA\Collectives\Db;
 
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 /**
- * @method Page insert(Entity $page)
- * @method Page update(Entity $page)
- * @method Page delete(Entity $page)
+ * @method Page insert(Page $page)
+ * @method Page update(Page $page)
+ * @method Page delete(Page $page)
  * @method Page findEntity(IQueryBuilder $query)
  * @template-extends QBMapper<Page>
  */
 class PageMapper extends QBMapper {
-	public function __construct(IDBConnection $db, ?string $entityClass = null) {
-		parent::__construct($db, 'collectives_pages', $entityClass);
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'collectives_pages', Page::class);
 	}
 
 	public function updateOrInsert(Page $page): Page {

lib/Listeners/BeforeTemplateRenderedListener.php

@@ -11,6 +11,7 @@
 
 use OCA\Collectives\AppInfo\Application;
 use OCA\Collectives\Fs\UserFolderHelper;
+use OCA\Collectives\Service\NotFoundException;
 use OCA\Collectives\Service\NotPermittedException;
 use OCA\Text\Event\LoadEditor;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
@@ -44,9 +45,10 @@ public function handle(Event $event): void {
 			Util::addStyle('collectives', 'collectives');
 
 			// Get Collectives user folder for users
-			$userId = $this->userSession->getUser()
-				? $this->userSession->getUser()->getUID()
-				: null;
+			$userId = $this->userSession->getUser()?->getUID();
+			if ($userId === null) {
+				throw new NotFoundException('Session user not found');
+			}
 			$userFolder = $this->userFolderHelper->getUserFolderSetting($userId);
 		}
 

lib/Listeners/TextMentionListener.php

@@ -40,6 +40,10 @@ public function handle(Event $event): void {
 			return;
 		}
 
+		if (!$this->userId) {
+			return;
+		}
+
 		$collective = $this->collectiveService->getCollective($mountPoint->getFolderId(), $this->userId);
 		$pageInfo = $this->pageService->findByFile($mountPoint->getFolderId(), $event->getFile(), $this->userId);
 

lib/Migration/MigrateTemplates.php

@@ -90,6 +90,7 @@ private function getFolderTemplateFiles(Folder $folder, bool $recursive = false)
 	 */
 	private function getTemplateFolder(Folder $collectiveFolder): Folder {
 		try {
+			/** @var Folder $templateFolder */
 			$templateFolder = $collectiveFolder->get(self::TEMPLATE_FOLDER);
 		} catch (FilesNotFoundException) {
 			// Create missing template folder