Skip to content

refactor(entity): Don't type id #57442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Altahrim merged 1 commit into from
Jan 12, 2026
Merged

refactor(entity): Don't type id #57442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/public/AppFramework/Db/Entity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
* @psalm-consistent-constructor
*/
abstract class Entity {
public int|string|null $id = null;
/** @var int $id */
Copy link
Contributor

@kyteinsky kyteinsky Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure but maybe it makes sense to adjust the the variable doc to /** @var int|string|null $id */ for psalm's indication at other places in the server repo since the other adjustments were made according to that

Copy link
Member Author

@CarlSchwan CarlSchwan Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately that breaks psalm for existing apps

public $id;
private array $_updatedFields = [];
/** @psalm-param $_fieldTypes array<string, Types::*> */
protected array $_fieldTypes = ['id' => 'integer'];
Expand Down
3 changes: 2 additions & 1 deletion lib/public/AppFramework/Db/SnowflakeAwareEntity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand All @@ -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());
Copy link
Member

@nickvergessen nickvergessen Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we have an explicit getId() in this entity which has the full return type?

Copy link
Member Author

@CarlSchwan CarlSchwan Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't work unless we add a https://www.php.net/manual/en/class.returntypewillchange.php, but not sure this is worth it

}

return $this->snowflake;
Expand Down
Loading