diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php index 8bf42c1..a4f54f0 100644 --- a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php +++ b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php @@ -46,7 +46,7 @@ public function normalize($field_item, $format = NULL, array $context = array()) // The returned structure will be recursively merged into the normalized // entity so that the items are properly added to the _links and _embedded // objects. - $field_name = $field_item->getFieldDefinition()->getFieldName(); + $field_name = $field_item->getParent()->getName(); $entity = $field_item->getEntity(); $field_uri = $this->linkManager->getRelationUri($entity->entityType(), $entity->bundle(), $field_name); return array( diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php index 9b45ecf..ebc328d 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php @@ -391,14 +391,14 @@ protected function checkIntrospection($entity_type) { $field = $entity->user_id; $this->assertIdentical($field->getRoot(), $entity, 'Entity is root object.'); - $this->assertIdentical($field->getEntity(), $entity); + $this->assertIdentical($field->getEntity(), $entity, 'getEntity() returns the entity.'); $this->assertEqual($field->getPropertyPath(), 'user_id'); $this->assertEqual($field->getName(), 'user_id'); $this->assertIdentical($field->getParent(), $entity, 'Parent object matches.'); $field_item = $field[0]; $this->assertIdentical($field_item->getRoot(), $entity, 'Entity is root object.'); - $this->assertIdentical($field_item->getEntity(), $entity); + $this->assertIdentical($field_item->getEntity(), $entity, 'getEntity() returns the entity.'); $this->assertEqual($field_item->getPropertyPath(), 'user_id.0'); $this->assertEqual($field_item->getName(), '0'); $this->assertIdentical($field_item->getParent(), $field, 'Parent object matches.');