Merge pull request #57442 from nextcloud/carl/entity-id-type

Author: Altahrim

lib/public/AppFramework/Db/Entity.php

@@ -19,7 +19,8 @@
  * @psalm-consistent-constructor
  */
 abstract class Entity {
-	public int|string|null $id = null;
+	/** @var int $id */
+	public $id;
 	private array $_updatedFields = [];
 	/** @psalm-param $_fieldTypes array<string, Types::*> */
 	protected array $_fieldTypes = ['id' => 'integer'];

lib/public/AppFramework/Db/SnowflakeAwareEntity.php

@@ -35,6 +35,7 @@ public function setId($id): void {
 	 */
 	public function generateId(): void {
 		if ($this->id === null) {
+			/** @psalm-suppress InvalidPropertyAssignmentValue */
 			$this->id = Server::get(ISnowflakeGenerator::class)->nextId();
 			$this->markFieldUpdated('id');
 		}
@@ -50,7 +51,7 @@ public function getSnowflake(): ?Snowflake {
 		}
 
 		if ($this->snowflake === null) {
-			$this->snowflake = Server::get(ISnowflakeDecoder::class)->decode($this->id);
+			$this->snowflake = Server::get(ISnowflakeDecoder::class)->decode($this->getId());
 		}
 
 		return $this->snowflake;