Merge pull request nilportugues#1 from HennerM/unique-inclueded-data

Unique inclueded data

Author: HennerM

src/Helpers/DataIncludedHelper.php

@@ -161,15 +161,28 @@ protected static function addToIncludedArray(array &$mappings, array &$data, arr
                     $arrayData[JsonApiTransformer::RELATIONSHIPS_KEY] = $relationships;
                 }
 
-                $data[JsonApiTransformer::INCLUDED_KEY][] = \array_filter($arrayData);
+                $existingIndex = false;
+                if (array_key_exists(JsonApiTransformer::INCLUDED_KEY, $data)) {
+                    $existingIndex = self::findIncludedIndex($data[JsonApiTransformer::INCLUDED_KEY], $arrayData[JsonApiTransformer::ID_KEY], $arrayData[JsonApiTransformer::TYPE_KEY]);
+                }
+                if ($existingIndex !== false) {
+                    $data[JsonApiTransformer::INCLUDED_KEY][$existingIndex] = \array_filter(\array_merge($data[JsonApiTransformer::INCLUDED_KEY][$existingIndex], $arrayData));
+                } else {
+                    $data[JsonApiTransformer::INCLUDED_KEY][] = \array_filter($arrayData);
+                }
             }
         }
+    }
 
-        if (!empty($data[JsonApiTransformer::INCLUDED_KEY])) {
-            $data[JsonApiTransformer::INCLUDED_KEY] = \array_values(
-                \array_unique($data[JsonApiTransformer::INCLUDED_KEY], SORT_REGULAR)
-            );
+    protected static function findIncludedIndex($includedData, $idNeedle, $typeNeedle)
+    {
+        foreach ($includedData as $key => $value) {
+            if ($value[JsonApiTransformer::ID_KEY] === $idNeedle && $value[JsonApiTransformer::TYPE_KEY] === $typeNeedle) {
+                return $key;
+            }
         }
+
+        return false;
     }
 
     /**

tests/Integrations/Doctrine/DoctrineTest.php

@@ -191,7 +191,12 @@ public function testSecondLevelNestingEntitySerialize()
 		         "type":"post",
 		         "id":"1",
 		         "attributes":{  
-		            "description":"Description test"
+		            "description":"Description test",
+		            "date":{  
+		               "date":"2016-07-12 16:30:12.000000",
+		               "timezone_type":3,
+		               "timezone":"Europe/Madrid"
+		            }
 		         },
 		         "relationships":{  
 		            "customer":{  
@@ -228,31 +233,6 @@ public function testSecondLevelNestingEntitySerialize()
 		               "href":"http://example.com/comment/1"
 		            }
 		         }
-		      },
-		      {  
-		         "type":"post",
-		         "id":"1",
-		         "attributes":{  
-		            "date":{  
-		               "date":"2016-07-12 16:30:12.000000",
-		               "timezone_type":3,
-		               "timezone":"Europe/Madrid"
-		            },
-		            "description":"Description test"
-		         },
-		         "relationships":{  
-		            "customer":{  
-		               "data":{  
-		                  "type":"customer",
-		                  "id":"1"
-		               }
-		            }
-		         },
-		         "links":{  
-		            "self":{  
-		               "href":"http://example.com/post/1"
-		            }
-		         }
 		      }
 		   ],
 		   "links":{