Merge pull request #247 from bearsunday/patch

Fix link override failed test
bearsunday · Aug 12, 2017 · 45e5b49 · 45e5b49
2 parents 6d5e6d2 + d714c5b
commit 45e5b49
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 5 deletions.
diff --git a/src/Provide/Representation/HalRenderer.php b/src/Provide/Representation/HalRenderer.php
@@ -216,8 +216,10 @@ private function getHalLink(array $body, array $methodAnnotations, Hal $hal)
             $hal->addLink($annotation->rel, $reverseUri);
         }
         if (isset($body['_links'])) {
-            foreach ($body['_links'] as $rel => $annotation) {
-                $hal->addLink($rel, $annotation);
+            foreach ($body['_links'] as $rel => $link) {
+                $attr = $link;
+                unset($attr['href']);
+                $hal->addLink($rel, $link['href'], $attr);
             }
         }
     }

diff --git a/tests/Fake/fake-app/src/Resource/App/Hal.php b/tests/Fake/fake-app/src/Resource/App/Hal.php
@@ -0,0 +1,27 @@
+<?php
+namespace FakeVendor\HelloWorld\Resource\App;
+
+use BEAR\Resource\ResourceObject;
+
+class Hal extends ResourceObject
+{
+    public $body = [
+        'message' => 'Welcome',
+        '_links' => [
+            'self' => [
+                'href' => '/',
+            ],
+            'curies' => [
+                'href' => 'http://localhost:8080/docs/{?rel}',
+                'name' => 'pt',
+                'templated' => true
+            ],
+            'pt:todo' => ['href' => '/todo']
+        ]
+    ];
+
+    public function onGet()
+    {
+        return $this;
+    }
+}
diff --git a/tests/Fake/fake-app/src/Resource/App/Post.php b/tests/Fake/fake-app/src/Resource/App/Post.php
@@ -20,9 +20,13 @@ class Post extends ResourceObject
      */
     public function onGet($id)
     {
-        $this['id'] = $id;
-        $this['name'] = 'user_'  .$id;
-        $this['_links'] =['test' => '/test'];
+        $this->body = [
+            'id' => $id,
+            'name' => 'user_'  .$id,
+            '_links' => [
+                'test' => ['href' => '/test']
+            ]
+        ];
 
         return $this;
     }

diff --git a/tests/Provide/Representation/HalRendererTest.php b/tests/Provide/Representation/HalRendererTest.php
@@ -192,4 +192,30 @@ public function test201Created()
         $this->assertSame(201, $ro->code);
         $this->assertSame('/post?id=10', $ro->headers['Location']);
     }
+
+    public function testLinksAlreadyExists()
+    {
+        $ro = $this->resource->get->uri('app://self/hal')->eager->request();
+        $result = (string) $ro;
+        $expect = '{
+    "message": "Welcome",
+    "_links": {
+        "self": {
+            "href": "/"
+        },
+        "curies": [
+            {
+                "href": "http://localhost:8080/docs/{?rel}",
+                "name": "pt",
+                "templated": true
+            }
+        ],
+        "pt:todo": {
+            "href": "/todo"
+        }
+    }
+}
+';
+        $this->assertSame($expect, $result);
+    }
 }