Merge branch '2.0' into 2.1

Author: dunglas

features/main/relation.feature

@@ -443,7 +443,6 @@ Feature: Relations support
     }
     """
 
-  @dropSchema
   Scenario: Issue #1222
     Given there are people having pets
     When I add "Content-Type" header equal to "application/ld+json"
@@ -475,3 +474,29 @@ Feature: Relations support
       "hydra:totalItems": 1
     }
     """
+
+  @dropSchema
+  Scenario: Issue #1547 Passing wrong argument to a relation
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I send a "POST" request to "/relation_embedders" with body:
+    """
+    {
+      "related": "certainly not an iri"
+    }
+    """
+    Then the response status code should be 400
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+    And the JSON node "hydra:description" should contain "Expected IRI or nested document"
+
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I send a "POST" request to "/relation_embedders" with body:
+    """
+    {
+      "related": 8
+    }
+    """
+    Then the response status code should be 400
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+    And the JSON node "hydra:description" should contain "Expected IRI or nested document"

src/Serializer/AbstractItemNormalizer.php

@@ -292,7 +292,10 @@ private function denormalizeRelation(string $attributeName, PropertyMetadata $pr
             }
         }
 
-        if (!$this->resourceClassResolver->isResourceClass($className) || $propertyMetadata->isWritableLink()) {
+        if (
+            !$this->resourceClassResolver->isResourceClass($className) ||
+            ($propertyMetadata->isWritableLink() && is_array($value))
+        ) {
             $context['resource_class'] = $className;
 
             return $this->serializer->denormalize($value, $className, $format, $context);