fixup! feat: extend Entity and adjust QBMapper to support Snowflake IDs

Author: miaulalala

apps/files_versions/lib/Db/VersionEntity.php

@@ -44,7 +44,7 @@ public function __construct() {
 
 	public function jsonSerialize(): array {
 		return [
-			'id' => $this->id,
+			'id' => $this->getId(),
 			'file_id' => $this->fileId,
 			'timestamp' => $this->timestamp,
 			'size' => $this->size,

lib/public/AppFramework/Db/Entity.php

@@ -13,19 +13,23 @@
 use function substr;
 
 /**
- * @method int getId()
- * @method void setId(int $id)
  * @since 7.0.0
  * @psalm-consistent-constructor
  */
 abstract class Entity {
-	/** @var int $id */
-	public $id = null;
-
+	private ?int $id = null;
 	private array $_updatedFields = [];
-	/** @var array<string, \OCP\DB\Types::*> */
+	/** @psalm-param $_fieldTypes array<string, Types::*> */
 	private array $_fieldTypes = ['id' => 'integer'];
 
+	public function setId($id): void {
+		$this->id = $id;
+	}
+
+	public function getId(): ?int {
+		return $this->id;
+	}
+
 	/**
 	 * Simple alternative constructor for building entities from a request
 	 * @param array $params the array which was obtained via $this->params('key')
@@ -64,7 +68,7 @@ public static function fromRow(array $row): static {
 
 
 	/**
-	 * @return array<string, \OCP\DB\Types::*> with attribute and type
+	 * @return array<string, Types::*> with attribute and type
 	 * @since 7.0.0
 	 */
 	public function getFieldTypes(): array {
@@ -266,8 +270,8 @@ public function getUpdatedFields(): array {
 	 * that value once its being returned from the database
 	 *
 	 * @param string $fieldName the name of the attribute
-	 * @param \OCP\DB\Types::* $type the type which will be used to match a cast
-	 * @since 31.0.0 Parameter $type is now restricted to {@see \OCP\DB\Types} constants. The formerly accidentally supported types 'int'|'bool'|'double' are mapped to Types::INTEGER|Types::BOOLEAN|Types::FLOAT accordingly.
+	 * @param Types::* $type the type which will be used to match a cast
+	 * @since 31.0.0 Parameter $type is now restricted to {@see Types} constants. The formerly accidentally supported types 'int'|'bool'|'double' are mapped to Types::INTEGER|Types::BOOLEAN|Types::FLOAT accordingly.
 	 * @since 7.0.0
 	 */
 	protected function addType(string $fieldName, string $type): void {

lib/public/AppFramework/Db/QBMapper.php

@@ -114,7 +114,7 @@ public function insert(Entity $entity): Entity {
 
 		if ($entity instanceof SnowflakeAwareEntity) {
 			/** @psalm-suppress DocblockTypeContradiction */
-			if ($entity->id === null) {
+			if ($entity->getId() === null) {
 				$entity->setId();
 			}
 			$qb->executeStatement();

lib/public/AppFramework/Db/SnowflakeAwareEntity.php

@@ -21,32 +21,23 @@
  */
 #[Consumable(since: '33.0.0')]
 abstract class SnowflakeAwareEntity extends Entity {
-	/** @var string $id */
-	public $id;
-
+	private ?string $id = null;
 	protected ?Snowflake $snowflake = null;
 
-	/** @var array<string, \OCP\DB\Types::*> */
+	/** @psalm-param $_fieldTypes array<string, Types::*> */
 	private array $_fieldTypes = ['id' => Types::STRING];
 
 	/**
 	 * Automatically creates a snowflake ID
 	 */
-	public function setId(): void {
+	#[\Override]
+	public function setId($id = null): void {
 		if ($this->id === null) {
 			$this->id = Server::get(ISnowflakeGenerator::class)->nextId();
 			$this->markFieldUpdated('id');
 		}
 	}
 
-	/**
-	 * @psalm-suppress InvalidReturnStatement
-	 * @psalm-suppress InvalidReturnType
-	 */
-	public function getId(): string {
-		return $this->id;
-	}
-
 	public function getCreatedAt(): ?\DateTimeImmutable {
 		return $this->getSnowflake()?->getCreatedAt();
 	}