Merge getId and findId into single method

juniwalk · May 16, 2024 · 34bf249 · 34bf249
1 parent 4418bb8
commit 34bf249
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/src/Entity/Traits/Identifier.php b/src/Entity/Traits/Identifier.php
@@ -23,20 +23,15 @@ trait Identifier
 
 
 	/**
+	 * @return ($require is true ? int : ?int)
 	 * @throws EntityNotPersistedException
 	 */
-	public function getId(): int
+	public function getId(bool $require = false): ?int
 	{
-		if (!$this->isPersisted()) {
+		if ($require && !$this->isPersisted()) {
 			throw EntityNotPersistedException::fromEntity($this);
 		}
 
-		return $this->id;
-	}
-
-
-	public function findId(): ?int
-	{
 		return $this->id ?? null;
 	}