Merge pull request #30 from bedita/fix/1.x/mask-relationships

1.x - fix mask relationships
bedita · Jun 5, 2020 · d171d69 · d171d69
2 parents 9118e6b + 2f20c53
commit d171d69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Controller/ApiProxyTrait.php b/src/Controller/ApiProxyTrait.php
@@ -225,7 +225,7 @@ protected function maskResponseLinks(array $response): array
             }
             $response['data'] = $data;
         } else {
-            $response['data']['relationships'] = $this->maskMultiLinks($data);
+            $response['data'] = $this->maskMultiLinks($data);
         }
 
         return (array)$response;

diff --git a/tests/TestCase/Controller/ApiProxyTraitTest.php b/tests/TestCase/Controller/ApiProxyTraitTest.php
@@ -116,7 +116,10 @@ public function testGet(): void
             static::assertStringStartsWith($baseUrl, $link);
         }
 
-        foreach (Hash::extract($response, 'data.relationships.{s}.links') as $link) {
+        $relationshipsLinks = (array)Hash::extract($response, 'data.relationships.{s}.links.{s}');
+        static::assertNotEmpty($relationshipsLinks);
+
+        foreach ($relationshipsLinks as $link) {
             static::assertStringStartsWith($baseUrl, $link);
         }
     }
@@ -174,7 +177,10 @@ public function testMaskRelationshipsLinksGettingList(): void
         $this->assertContentType('application/json');
         $response = json_decode((string)$this->_response, true);
 
-        foreach (Hash::extract($response, 'data.{n}.relationships.{s}.links.{s}') as $link) {
+        $relationshipsLinks = (array)Hash::extract($response, 'data.{n}.relationships.{s}.links.{s}');
+        static::assertNotEmpty($relationshipsLinks);
+
+        foreach ($relationshipsLinks as $link) {
             static::assertStringStartsWith($this->getBaseUrl(), $link);
         }
     }