Only add relation with data to JSON API array

Author: JaZo

src/Item.php

@@ -130,25 +130,27 @@ public function getRelationships(): array
         $relationships = [];
 
         foreach ($this->getRelations() as $name => $relation) {
-            if ($relation->hasIncluded()) {
-                if ($relation instanceof OneRelationInterface) {
-                    $relationships[$name]['data'] = null;
-
-                    if ($relation->getIncluded() !== null) {
-                        $relationships[$name]['data'] = [
-                            'type' => $relation->getIncluded()->getType(),
-                            'id' => $relation->getIncluded()->getId(),
-                        ];
-                    }
-                } elseif ($relation instanceof ManyRelationInterface) {
-                    $relationships[$name]['data'] = [];
-
-                    foreach ($relation->getIncluded() as $item) {
-                        $relationships[$name]['data'][] = [
-                            'type' => $item->getType(),
-                            'id' => $item->getId(),
-                        ];
-                    }
+            if (!$relation->hasIncluded()) {
+                continue;
+            }
+
+            if ($relation instanceof OneRelationInterface) {
+                $relationships[$name]['data'] = null;
+
+                if ($relation->getIncluded() !== null) {
+                    $relationships[$name]['data'] = [
+                        'type' => $relation->getIncluded()->getType(),
+                        'id' => $relation->getIncluded()->getId(),
+                    ];
+                }
+            } elseif ($relation instanceof ManyRelationInterface) {
+                $relationships[$name]['data'] = [];
+
+                foreach ($relation->getIncluded() as $item) {
+                    $relationships[$name]['data'][] = [
+                        'type' => $item->getType(),
+                        'id' => $item->getId(),
+                    ];
                 }
             }
 

tests/ItemTest.php

@@ -132,11 +132,13 @@ public function is_adds_empty_hasone_relation_in_to_json_api_array()
     /**
      * @test
      */
-    public function is_does_not_add_hasone_relation_without_data_links_and_meta_in_to_json_api_array()
+    public function is_does_not_add_hasone_relation_without_data_in_to_json_api_array()
     {
         $item = new WithRelationshipItem();
         $item->setId('1234');
         $item->hasoneRelation();
+        $item->hasoneRelation()->setLinks(new Links(['self' => new Link('http://example.com/articles')]));
+        $item->hasoneRelation()->setMeta(new Meta(['foo' => 'bar']));
 
         $this->assertSame(
             [
@@ -211,11 +213,13 @@ public function is_adds_empty_hasmany_relation_in_to_json_api_array()
     /**
      * @test
      */
-    public function is_does_not_add_hasmany_relation_without_data_links_and_meta_in_to_json_api_array()
+    public function is_does_not_add_hasmany_relation_without_data_in_to_json_api_array()
     {
         $item = new WithRelationshipItem();
         $item->setId('1234');
         $item->hasmanyRelation();
+        $item->hasmanyRelation()->setLinks(new Links(['self' => new Link('http://example.com/articles')]));
+        $item->hasmanyRelation()->setMeta(new Meta(['foo' => 'bar']));
 
         $this->assertSame(
             [
@@ -288,11 +292,13 @@ public function is_adds_empty_morphto_relation_in_to_json_api_array()
     /**
      * @test
      */
-    public function is_does_not_add_morphto_relation_without_data_links_and_meta_in_to_json_api_array()
+    public function is_does_not_add_morphto_relation_without_data_in_to_json_api_array()
     {
         $item = new WithRelationshipItem();
         $item->setId('1234');
         $item->morphtoRelation();
+        $item->morphtoRelation()->setLinks(new Links(['self' => new Link('http://example.com/articles')]));
+        $item->morphtoRelation()->setMeta(new Meta(['foo' => 'bar']));
 
         $this->assertSame(
             [
@@ -367,11 +373,13 @@ public function is_adds_empty_morphtomany_relation_in_to_json_api_array()
     /**
      * @test
      */
-    public function is_does_not_add_morphtomany_relation_without_data_links_and_meta_in_to_json_api_array()
+    public function is_does_not_add_morphtomany_relation_without_data_in_to_json_api_array()
     {
         $item = new WithRelationshipItem();
         $item->setId('1234');
         $item->morphtomanyRelation();
+        $item->morphtomanyRelation()->setLinks(new Links(['self' => new Link('http://example.com/articles')]));
+        $item->morphtomanyRelation()->setMeta(new Meta(['foo' => 'bar']));
 
         $this->assertSame(
             [