Skip to content

Make it possible to strong type Entity properties #37209

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

Closed
come-nc wants to merge 4 commits into from
Closed

Make it possible to strong type Entity properties #37209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6dc931
Make it possible to strong type Entity properties
come-nc Mar 14, 2023
3ef506d
id is null before an entity is inserted
come-nc Mar 14, 2023
f7a61ac
Make sure token getId returns an int for tests
come-nc May 11, 2023
47f8411
fixup! Make it possible to strong type Entity properties
come-nc Jun 26, 2023
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
Prev Previous commit
Next Next commit
Make sure token getId returns an int for tests 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Jun 26, 2023
commit f7a61ac18f3c38c6bb43f747f61189f8ada99f0d
2 changes: 1 addition & 1 deletion lib/private/Authentication/Token/IToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ interface IToken extends JsonSerializable {
/**
* Get the token ID
*/
public function getId(): ?int;
public function getId(): int;

/**
* Get the user UID
Expand Down
8 changes: 6 additions & 2 deletions lib/private/Authentication/Token/PublicKeyToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,12 @@ public function __construct() {
$this->addType('passwordInvalid', 'bool');
}

public function getId(): ?int {
return $this->id;
public function getId(): int {
if ($this->id !== null) {
return $this->id;
} else {
throw new \InvalidArgumentException('Cannot call getId on an token which was not inserted yet');
}
}

public function getUID(): string {
Expand Down