fix(DB): Fix return codes

Signed-off-by: Jonas <[email protected]>

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/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/Team/CollectiveTeamResourceProvider.php

@@ -65,7 +65,7 @@ public function getSharedWith(string $teamId): array {
 
 	public function isSharedWithTeam(string $teamId, string $resourceId): bool {
 		$teamIds = $this->getTeamsForResource($resourceId);
-		return in_array($teamId, $teamIds);
+		return in_array($teamId, $teamIds, true);
 	}
 
 	public function getTeamsForResource(string $resourceId): array {
@@ -74,7 +74,6 @@ public function getTeamsForResource(string $resourceId): array {
 		} catch (NotFoundException|NotPermittedException) {
 			return [];
 		}
-		$circleId = $collective->getCircleId();
-		return $circleId === null ? [] : [$circleId];
+		return [$collective->getCircleId()];
 	}
 }