Link model fixes (#58)

Author: f3ath

.php_cs.dist

@@ -21,7 +21,6 @@ return PhpCsFixer\Config::create()
         'method_separation' => true,
         'native_function_casing' => true,
         'no_blank_lines_after_class_opening' => true,
-        'no_blank_lines_after_phpdoc' => true,
         'no_empty_statement' => true,
         'no_extra_consecutive_blank_lines' => true,
         'no_leading_import_slash' => true,

README.md

@@ -27,17 +27,17 @@ A simple example to illustrate the general idea. This JSON representation from
     }
 }
 ```
-can be built with the following php code:
+can be built with the following php code (less imports):
 ```php
 <?php
 $articles = new ResourceObject('articles', '1');
 $author = Relationship::fromLinkage(
-    Linkage::fromSingleIdentifier(
+    new SingleLinkage(
         new ResourceIdentifier('people', '9')
     )
 );
 $author->setLink('self', '/articles/1/relationships/author');
-$author->setLink('related', '/articles/1/author');
+$author->setLink('related','/articles/1/author');
 $articles->setRelationship('author', $author);
 $articles->setAttribute('title', 'Rails is Omakase');
 $doc = Document::fromResource($articles);

src/Document.php

@@ -7,6 +7,7 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  */
+
 declare(strict_types=1);
 
 namespace JsonApiPhp\JsonApi;

src/Document/Error.php

@@ -7,6 +7,7 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  */
+
 declare(strict_types=1);
 
 namespace JsonApiPhp\JsonApi\Document;

src/Document/Link/Link.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ *  This file is part of JSON:API implementation for PHP.
+ *
+ *  (c) Alexey Karapetov <[email protected]>
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace JsonApiPhp\JsonApi\Document\Link;
+
+final class Link implements LinkInterface
+{
+    private $url;
+
+    public function __construct(string $url)
+    {
+        $this->url = $url;
+    }
+
+    public function jsonSerialize()
+    {
+        return $this->url;
+    }
+}

src/Document/Link/LinkInterface.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ *  This file is part of JSON:API implementation for PHP.
+ *
+ *  (c) Alexey Karapetov <[email protected]>
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace JsonApiPhp\JsonApi\Document\Link;
+
+interface LinkInterface extends \JsonSerializable
+{
+    public function jsonSerialize();
+}

src/Document/Link/LinkObject.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ *  This file is part of JSON:API implementation for PHP.
+ *
+ *  (c) Alexey Karapetov <[email protected]>
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace JsonApiPhp\JsonApi\Document\Link;
+
+use JsonApiPhp\JsonApi\Document\Meta;
+
+final class LinkObject implements LinkInterface
+{
+    private $link;
+
+    public function __construct(string $href, Meta $meta = null)
+    {
+        $this->link['href'] = $href;
+        if ($meta) {
+            $this->link['meta'] = $meta;
+        }
+    }
+
+    public function jsonSerialize()
+    {
+        return $this->link;
+    }
+}

src/Document/LinksTrait.php

@@ -7,16 +7,28 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  */
+
 declare(strict_types=1);
 
 namespace JsonApiPhp\JsonApi\Document;
 
+use JsonApiPhp\JsonApi\Document\Link\Link;
+use JsonApiPhp\JsonApi\Document\Link\LinkInterface;
+
 trait LinksTrait
 {
+    /**
+     * @var LinkInterface[]
+     */
     protected $links;
 
-    public function setLink(string $name, string $value, array $meta = null)
+    public function setLink(string $name, string $url)
+    {
+        $this->links[$name] = new Link($url);
+    }
+
+    public function setLinkObject(string $name, LinkInterface $link)
     {
-        $this->links[$name] = $meta ? ['href' => $value, 'meta' => $meta] : $value;
+        $this->links[$name] = $link;
     }
 }

src/Document/Meta.php

@@ -7,6 +7,7 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  */
+
 declare(strict_types=1);
 
 namespace JsonApiPhp\JsonApi\Document;

src/Document/MetaTrait.php

@@ -7,6 +7,7 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  */
+
 declare(strict_types=1);
 
 namespace JsonApiPhp\JsonApi\Document;