Make id optional

ipublikuj · May 24, 2021 · 5781035 · 5781035
1 parent 3bd587b
commit 5781035
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/Objects/IResourceIdentifierObject.php b/src/Objects/IResourceIdentifierObject.php
@@ -29,9 +29,9 @@ interface IResourceIdentifierObject
 {
 
 	/**
-	 * @return string
+	 * @return string|null
 	 */
-	public function getId(): string;
+	public function getId(): ?string;
 
 	/**
 	 * @return string

diff --git a/src/Objects/IResourceObject.php b/src/Objects/IResourceObject.php
@@ -29,9 +29,9 @@ interface IResourceObject
 {
 
 	/**
-	 * @return string
+	 * @return string|null
 	 */
-	public function getId(): string;
+	public function getId(): ?string;
 
 	/**
 	 * @return string

diff --git a/src/Objects/ResourceIdentifierCollection.php b/src/Objects/ResourceIdentifierCollection.php
@@ -178,7 +178,9 @@ public function getIds(): array
 		$ids = [];
 
 		foreach ($this->stack as $identifier) {
-			$ids[] = $identifier->getId();
+			if ($identifier->getId() !== null) {
+				$ids[] = $identifier->getId();
+			}
 		}
 
 		return $ids;

diff --git a/src/Objects/ResourceIdentifierObject.php b/src/Objects/ResourceIdentifierObject.php
@@ -32,15 +32,15 @@ class ResourceIdentifierObject implements IResourceIdentifierObject
 	/** @var string */
 	private string $type;
 
-	/** @var string */
-	private string $id;
+	/** @var string|null */
+	private ?string $id;
 
 	public function __construct(IStandardObject $data)
 	{
 		$type = $data->get(JsonAPIDocument\IDocument::KEYWORD_TYPE);
 		$id = $data->get(JsonAPIDocument\IDocument::KEYWORD_ID);
 
-		if (!is_string($type) || !is_string($id)) {
+		if (!is_string($type) || (!is_string($id) && $id !== null)) {
 			throw new Exceptions\InvalidArgumentException('Data member has invalid format');
 		}
 
@@ -51,7 +51,7 @@ public function __construct(IStandardObject $data)
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getId(): string
+	public function getId(): ?string
 	{
 		return $this->id;
 	}

diff --git a/src/Objects/ResourceObject.php b/src/Objects/ResourceObject.php
@@ -39,8 +39,10 @@ class ResourceObject implements IResourceObject
 	public function __construct(Objects\IStandardObject $data)
 	{
 		if (
-			!$data->has(JsonAPIDocument\IDocument::KEYWORD_ID)
-			|| !is_string($data->get(JsonAPIDocument\IDocument::KEYWORD_ID))
+			(
+				$data->has(JsonAPIDocument\IDocument::KEYWORD_ID)
+				&& !is_string($data->get(JsonAPIDocument\IDocument::KEYWORD_ID))
+			)
 			|| !$data->has(JsonAPIDocument\IDocument::KEYWORD_TYPE)
 			|| !is_string($data->get(JsonAPIDocument\IDocument::KEYWORD_TYPE))
 		) {
@@ -54,7 +56,7 @@ public function __construct(Objects\IStandardObject $data)
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getId(): string
+	public function getId(): ?string
 	{
 		return $this->identifier->getId();
 	}