php70 (#12)

* php70

* php70

Author: f3ath

.travis.yml

@@ -1,5 +1,6 @@
 language: php
 php:
+  - '7.0'
   - '7.1'
   - nightly
 

composer.json

@@ -11,7 +11,7 @@
     }
   ],
   "require": {
-    "php": ">=7.1"
+    "php": ">=7.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.0",

src/Document/Document.php

@@ -28,14 +28,11 @@ final class Document implements \JsonSerializable
     private $data;
     private $errors;
     private $meta;
-    private $jsonapi;
+    private $json_api;
     private $links;
     private $included;
-    private $sparse = false;
+    private $is_sparse = false;
 
-    /**
-     * Use named constructors instead
-     */
     private function __construct()
     {
     }
@@ -68,42 +65,35 @@ public static function fromResources(IdentifiableResource ...$data): self
         return $doc;
     }
 
-    public function setApiVersion(string $version = self::DEFAULT_API_VERSION): void
+    public function setApiVersion(string $version = self::DEFAULT_API_VERSION)
     {
-        $this->jsonapi['version'] = $version;
+        $this->json_api['version'] = $version;
     }
 
-    public function setApiMeta(array $meta): void
+    public function setApiMeta(array $meta)
     {
-        $this->jsonapi['meta'] = $meta;
+        $this->json_api['meta'] = $meta;
     }
 
     public function setIncluded(IdentifiableResource ...$included)
     {
         $this->included = $included;
     }
 
-    public function setSparse()
+    public function setIsSparse()
     {
-        $this->sparse = true;
+        $this->is_sparse = true;
     }
 
     public function jsonSerialize()
     {
-        if ($this->included && !$this->sparse) {
-            foreach ($this->included as $resource) {
-                if ($this->hasLinkTo($resource)) {
-                    continue;
-                }
-                throw new \LogicException("Full linkage is required for $resource");
-            }
-        }
+        $this->enforceFullLinkage();
         return array_filter(
             [
                 'data' => $this->data,
                 'errors' => $this->errors,
                 'meta' => $this->meta,
-                'jsonapi' => $this->jsonapi,
+                'jsonapi' => $this->json_api,
                 'links' => $this->links,
                 'included' => $this->included,
             ],
@@ -113,12 +103,20 @@ function ($v) {
         );
     }
 
-    private function hasLinkTo(IdentifiableResource $resource): bool
+    private function enforceFullLinkage()
     {
-        if (!$this->data) {
-            return false;
+        if ($this->is_sparse || empty($this->included)) {
+            return;
         }
+        foreach ($this->included as $resource) {
+            if (!$this->hasLinkTo($resource)) {
+                throw new \LogicException("Full linkage is required for $resource");
+            }
+        }
+    }
 
+    private function hasLinkTo(IdentifiableResource $resource): bool
+    {
         foreach ($this->toDataItems() as $my_resource) {
             if ($my_resource instanceof ResourceObject) {
                 if ($my_resource->hasRelationTo($resource)) {

src/Document/Error.php

@@ -29,43 +29,42 @@ final class Error implements \JsonSerializable
     private $source;
     private $meta;
 
-    public function setId(string $id): void
+    public function setId(string $id)
     {
         $this->id = $id;
     }
 
-    public function setAboutLink(string $link): void
+    public function setAboutLink(string $link)
     {
         $this->links['about'] = $link;
     }
 
-    public function setStatus(string $status): void
+    public function setStatus(string $status)
     {
         $this->status = $status;
     }
 
-    public function setCode(string $code): void
+    public function setCode(string $code)
     {
         $this->code = $code;
     }
 
-
-    public function setTitle(string $title): void
+    public function setTitle(string $title)
     {
         $this->title = $title;
     }
 
-    public function setDetail(string $detail): void
+    public function setDetail(string $detail)
     {
         $this->detail = $detail;
     }
 
-    public function setSourcePointer(string $pointer): void
+    public function setSourcePointer(string $pointer)
     {
         $this->source['pointer'] = $pointer;
     }
 
-    public function setSourceParameter(string $parameter): void
+    public function setSourceParameter(string $parameter)
     {
         $this->source['parameter'] = $parameter;
     }
@@ -74,14 +73,14 @@ public function jsonSerialize()
     {
         return array_filter(
             [
-                'id'     => $this->id,
-                'links'  => $this->links,
+                'id' => $this->id,
+                'links' => $this->links,
                 'status' => $this->status,
-                'code'   => $this->code,
-                'title'  => $this->title,
+                'code' => $this->code,
+                'title' => $this->title,
                 'detail' => $this->detail,
                 'source' => $this->source,
-                'meta'   => $this->meta,
+                'meta' => $this->meta,
             ],
             function ($v) {
                 return null !== $v;

src/Document/Resource/IdentifiableResource.php

@@ -22,7 +22,7 @@ public function isEqualTo(IdentifiableResource $that): bool
         return $this->type === $that->type && $this->id === $that->id;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return "$this->type:$this->id";
     }

src/Document/Resource/Relationship/Linkage.php

@@ -30,7 +30,7 @@ public static function nullLinkage(): self
         return new self;
     }
 
-    public static function emptyArrayLinkage()
+    public static function emptyArrayLinkage(): self
     {
         $linkage = new self;
         $linkage->data = [];
@@ -54,7 +54,7 @@ public static function fromManyResourceIds(ResourceId ...$data): self
     public function isLinkedTo(IdentifiableResource $resource): bool
     {
         if ($this->data) {
-            foreach ((array)$this->data as $my_resource) {
+            foreach ($this->data as $my_resource) {
                 if ($resource->isEqualTo($my_resource)) {
                     return true;
                 }

src/Document/Resource/ResourceId.php

@@ -26,17 +26,15 @@ public function __construct(string $type, string $id = null, array $meta = [])
     {
         $this->type = $type;
         $this->id = $id;
-        foreach ($meta as $k => $v) {
-            $this->setMeta($k, $v);
-        }
+        $this->replaceMeta($meta);
     }
 
     public function jsonSerialize()
     {
         return array_filter(
             [
                 'type' => $this->type,
-                'id'   => $this->id,
+                'id' => $this->id,
                 'meta' => $this->meta,
             ],
             function ($v) {

src/Document/Resource/ResourceObject.php

@@ -32,7 +32,7 @@ public function __construct(string $type, string $id = null)
         $this->type = $type;
     }
 
-    public function setAttribute(string $name, $value): void
+    public function setAttribute(string $name, $value)
     {
         if (in_array($name, ['id', 'type'])) {
             throw new \InvalidArgumentException('Invalid attribute name');
@@ -43,7 +43,7 @@ public function setAttribute(string $name, $value): void
         $this->attributes[$name] = $value;
     }
 
-    public function setRelationship(string $name, Relationship $relationship): void
+    public function setRelationship(string $name, Relationship $relationship)
     {
         if (isset($this->attributes[$name])) {
             throw new \LogicException("Field $name already exists in attributes");

src/HasLinks.php

@@ -16,7 +16,7 @@
 
 trait HasLinks
 {
-    public function setLink(string $name, string $value, array $meta = null): void
+    public function setLink(string $name, string $value, array $meta = null)
     {
         $this->links[$name] = $meta ? ['href' => $value, 'meta' => $meta] : $value;
     }

src/HasMeta.php

@@ -16,12 +16,12 @@
 
 trait HasMeta
 {
-    public function setMeta(string $key, $val): void
+    public function setMeta(string $key, $val)
     {
         $this->meta[$key] = $val;
     }
 
-    public function replaceMeta(array $meta): void
+    public function replaceMeta(array $meta)
     {
         $this->meta = null;
         foreach ($meta as $key => $value) {