fix(ORM): Address feedback from review

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Author: CarlSchwan

apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php

@@ -12,16 +12,13 @@
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\ORM\Repository;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\IDBConnection;
 use OCP\IUser;
 
 /**
  * @template-extends Repository<BackupCode>
  */
 class BackupCodeMapper extends Repository {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, BackupCode::class);
-	}
+	public const string entityClass = BackupCode::class;
 
 	/**
 	 * @return \Generator<BackupCode>

apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php

@@ -124,7 +124,11 @@ public function testGetBackupCodeDisabled(): void {
 		$this->mapper->expects($this->once())
 			->method('findByUser')
 			->with($user)
-			->willReturnCallback(function () { if (false) { yield true; }});
+			->willReturnCallback(function () {
+				if (false) {
+					yield true;
+				}
+			});
 
 		$expected = [
 			'enabled' => false,

lib/private/AppFramework/ORM/EntityManager.php

@@ -21,7 +21,7 @@
 
 class EntityManager {
 	public function __construct(
-		readonly private IDBConnection $connection,
+		private readonly IDBConnection $connection,
 	) {
 	}
 
@@ -43,12 +43,17 @@ public function getEntityInfo(string $entityClass): EntityInfo {
 	}
 
 	/**
+	 * Generic, runtime-typed repository factory for callers that only have the entity class as
+	 * a value (e.g. tests). Hand-written repositories (e.g. BackupCodeMapper) should instead
+	 * extend Repository and override its `entityClass` constant, which also gets them proper
+	 * static analysis of their entity type.
+	 *
 	 * @template T of object
 	 * @param class-string<T> $entityClass
 	 * @return Repository<T>
 	 */
 	public function getRepository(string $entityClass): Repository {
-		return new Repository($this->connection, $entityClass);
+		return new Repository($this->connection, $this, $entityClass);
 	}
 
 	/**

lib/private/Tagging/Tag.php

@@ -12,7 +12,6 @@
 use OCP\AppFramework\ORM\Attribute\Entity;
 use OCP\AppFramework\ORM\Attribute\Id;
 use OCP\DB\Types;
-use OCP\Snowflake\ISnowflakeGenerator;
 
 /**
  * Class to represent a tag.

lib/private/Tagging/TagMapper.php

@@ -9,17 +9,14 @@
 namespace OC\Tagging;
 
 use OCP\AppFramework\ORM\Repository;
-use OCP\IDBConnection;
 
 /**
  * Mapper for Tag entity
  *
  * @template-extends Repository<Tag>
  */
 class TagMapper extends Repository {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, Tag::class);
-	}
+	public const string entityClass = Tag::class;
 
 	/**
 	 * Load tags from the database.

lib/private/Tags.php

@@ -584,7 +584,7 @@ private function getTagId(string $name): int|false {
 	 *
 	 * @param string $name The tag name.
 	 * @return integer|false The tag object's offset within the $this->tags
-	 *                      array or false if it doesn't exist.
+	 *                       array or false if it doesn't exist.
 	 */
 	private function getTagByName(string $name): int|false {
 		return $this->array_searchi($name, $this->tags);

lib/public/AppFramework/ORM/Attribute/Column.php

@@ -27,6 +27,7 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 #[Consumable(since: '35.0.0')]
 final readonly class Column {
+	/** @since 35.0.0 */
 	public function __construct(
 		/** @param non-empty-string $name The name of the column in the database. */
 		public string $name,

lib/public/AppFramework/ORM/Attribute/Entity.php

@@ -26,8 +26,9 @@
 #[Attribute(Attribute::TARGET_CLASS)]
 #[Consumable(since: '35.0.0')]
 final readonly class Entity {
+	/** @since 35.0.0 */
 	public function __construct(
-		/** @param non-empty-string $name */
+		/** @param non-empty-string $name The name of the table in the database. */
 		public string $name,
 	) {
 	}

lib/public/AppFramework/ORM/Attribute/Id.php

@@ -28,6 +28,7 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 #[Consumable(since: '35.0.0')]
 final readonly class Id {
+	/** @since 35.0.0 */
 	public function __construct(
 		/** @param class-string<ISnowflakeGenerator> $generatorClass */
 		public ?string $generatorClass = null,

lib/public/AppFramework/ORM/Attribute/JoinColumn.php

@@ -27,6 +27,7 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 #[Consumable(since: '35.0.0')]
 final readonly class JoinColumn {
+	/** @since 35.0.0 */
 	public function __construct(
 		/** @param non-empty-string $name The name of the column in the database. */
 		public string $name,