Merge branch 'release/3.1.0'

Author: Philipp Marien

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change Log
 
+### 3.1.0
+* changed "set included" to "merge included"
+
 ### 3.0.0
 * removed pagination and moved it to json api common
 * removed special requests and moved it to json api common

composer.json

@@ -22,7 +22,7 @@
   "minimum-stability": "stable",
   "require": {
     "php": ">=7.2",
-    "enm/json-api-common": "^3.0"
+    "enm/json-api-common": "^3.2"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0"

composer.lock

@@ -191,11 +191,11 @@ protected function includeRelated(
             $shouldIncludeRelationship = $request->requestsInclude($relationship->name());
             $subRequest = $request->createSubRequest($relationship->name(), $resource);
             foreach ($relationship->related()->all() as $related) {
-                if ($shouldIncludeRelationship && !$document->included()->has($related->type(), $related->id())) {
-                    $document->included()->set($related);
+                if ($shouldIncludeRelationship) {
+                    $document->included()->merge($related);
                 }
                 $this->includeRelated($document, $related, $subRequest);
-                $this->cleanUpResource($related, $subRequest);
+                $this->cleanUpResource($document->included()->get($related->type(), $related->id()), $subRequest);
             }
         }
     }