From adb97dad3aaa55e832e91cd0f69bdd5fc100f84d Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 8 Jan 2015 19:44:25 +0000
Subject: [PATCH] Issue #2327935 by Arla, Anushka-mp: Allow empty entity IDs in
EntityResolvers
---
.../EntityReferenceItemNormalizer.php | 3 ++-
.../src/EntityResolver/ChainEntityResolver.php | 3 ++-
.../EntityResolver/ChainEntityResolverTest.php | 17 +++++++++++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php b/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
index 44ba17104425..f57873455609 100644
--- a/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
+++ b/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
@@ -103,7 +103,8 @@ protected function constructValue($data, $context) {
$field_item = $context['target_instance'];
$field_definition = $field_item->getFieldDefinition();
$target_type = $field_definition->getSetting('target_type');
- if ($id = $this->entityResolver->resolve($this, $data, $target_type)) {
+ $id = $this->entityResolver->resolve($this, $data, $target_type);
+ if (isset($id)) {
return array('target_id' => $id);
}
return NULL;
diff --git a/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php b/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php
index e1291c1d286c..af105574f813 100644
--- a/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php
+++ b/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php
@@ -43,7 +43,8 @@ public function addResolver(EntityResolverInterface $resolver) {
*/
public function resolve(NormalizerInterface $normalizer, $data, $entity_type) {
foreach ($this->resolvers as $resolver) {
- if ($resolved = $resolver->resolve($normalizer, $data, $entity_type)) {
+ $resolved = $resolver->resolve($normalizer, $data, $entity_type);
+ if (isset($resolved)) {
return $resolved;
}
}
diff --git a/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php b/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
index 64d8ca6d961f..22cffacd7d37 100644
--- a/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
+++ b/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
@@ -110,6 +110,23 @@ public function testResolverWithLastResolved() {
$this->assertSame(10, $resolver->resolve($this->testNormalizer, $this->testData, $this->testEntityType));
}
+ /**
+ * Test the resolve method where one resolver returns 0.
+ *
+ * @covers ::__construct
+ * @covers ::resolve
+ */
+ public function testResolverWithResolvedToZero() {
+ $resolvers = array(
+ $this->createEntityResolverMock(0),
+ $this->createEntityResolverMock(NULL, FALSE),
+ );
+
+ $resolver = new ChainEntityResolver($resolvers);
+
+ $this->assertSame(0, $resolver->resolve($this->testNormalizer, $this->testData, $this->testEntityType));
+ }
+
/**
* Creates a mock entity resolver.
*
--
GitLab