More spec validator updates

Author: lindyhopchris

src/Spec/Document.php

@@ -20,16 +20,15 @@
 namespace LaravelJsonApi\Spec;
 
 use LaravelJsonApi\Core\Document\ErrorList;
-use stdClass;
 use function json_decode;
 
 class Document
 {
 
     /**
-     * @var stdClass
+     * @var object
      */
-    private stdClass $document;
+    private object $document;
 
     /**
      * @var ErrorList
@@ -46,7 +45,7 @@ public static function cast($json): self
             return self::fromString($json);
         }
 
-        if ($json instanceof stdClass) {
+        if (is_object($json)) {
             return new self($json);
         }
 
@@ -67,9 +66,9 @@ public static function fromString(string $json): self
     /**
      * Document constructor.
      *
-     * @param stdClass $document
+     * @param object $document
      */
-    public function __construct(stdClass $document)
+    public function __construct(object $document)
     {
         $this->document = $document;
         $this->errors = new ErrorList();
@@ -129,4 +128,12 @@ public function invalid(): bool
         return !$this->valid();
     }
 
+    /**
+     * @return object
+     */
+    public function toBase(): object
+    {
+        return $this->document;
+    }
+
 }

src/Spec/Validators/RelationshipValidator.php

@@ -146,30 +146,53 @@ private function acceptIdentifier($path, $value, int $idx = null): array
         $errors = [];
         $dataPath = sprintf('%s/%s', rtrim($path, '/'), $member);
 
-        if (!property_exists($value, 'type')) {
-            $errors[] = $this->translator->memberRequired($dataPath, 'type');
-        } else if ($error = $this->acceptType($dataPath, $value->type)) {
-            $errors[] = $error;
-        }
+        $errors[] = $this->acceptIdentifierType($dataPath, $value);
+        $errors[] = $this->acceptIdentifierId($dataPath, $value);
 
-        return $errors;
+        return array_filter($errors);
     }
 
     /**
-     * @param $path
-     * @param $value
+     * @param string $path
+     * @param object $identifier
      * @return Error|null
      */
-    private function acceptType($path, $value): ?Error
+    private function acceptIdentifierType(string $path, object $identifier): ?Error
     {
-        if (!is_string($value)) {
+        if (!property_exists($identifier, 'type')) {
+            return $this->translator->memberRequired($path, 'type');
+        }
+
+        if (!is_string($identifier->type)) {
             return $this->translator->memberNotString($path, 'type');
         }
 
-        if (empty($value)) {
+        if (empty($identifier->type)) {
             return $this->translator->memberEmpty($path, 'type');
         }
 
         return null;
     }
+
+    /**
+     * @param string $path
+     * @param object $identifier
+     * @return Error|null
+     */
+    private function acceptIdentifierId(string $path, object $identifier): ?Error
+    {
+        if (!property_exists($identifier, 'id')) {
+            return $this->translator->memberRequired($path, 'id');
+        }
+
+        if (!is_string($identifier->id)) {
+            return $this->translator->memberNotString($path, 'id');
+        }
+
+        if (empty($identifier->id) && '0' !== $identifier->id) {
+            return $this->translator->memberEmpty($path, 'id');
+        }
+
+        return null;
+    }
 }

tests/lib/Integration/Spec/ResourceTest.php

@@ -321,7 +321,7 @@ public function createProvider(): array
                 ],
                 [
                     'title' => 'Non-Compliant JSON API Document',
-                    'detail' => "The member data must be an object.",
+                    'detail' => "The member type is required.",
                     'status' => '400',
                     'source' => ['pointer' => '/data/relationships/author/data'],
                 ],
@@ -346,7 +346,7 @@ public function createProvider(): array
                 ],
                 [
                     'title' => 'Non-Compliant JSON API Document',
-                    'detail' => "The member data must be an object.",
+                    'detail' => "The member id is required.",
                     'status' => '400',
                     'source' => ['pointer' => '/data/relationships/author/data'],
                 ],
@@ -457,7 +457,7 @@ public function createProvider(): array
                 ],
                 [
                     'title' => 'Non-Compliant JSON API Document',
-                    'detail' => "The member type is required.",
+                    'detail' => "The member id is required.",
                     'status' => '400',
                     'source' => ['pointer' => '/data/relationships/tags/data/0'],
                 ],