Support embedded object for the show mapper

sonata-project · Jun 1, 2016 · 5c99a46 · 5c99a46
1 parent 6eeb1ad
commit 5c99a46
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/Admin/FieldDescription.php b/Admin/FieldDescription.php
@@ -98,6 +98,10 @@ public function getValue($object)
             $object = $this->getFieldValue($object, $parentAssociationMapping['fieldName']);
         }
 
+        if (isset($this->getFieldMapping()['declaredField'])) {
+            $object = $this->getFieldValue($object, $this->getFieldMapping()['declaredField']);
+        }
+
         return $this->getFieldValue($object, $this->fieldName);
     }
 }
diff --git a/Tests/Admin/FieldDescriptionTest.php b/Tests/Admin/FieldDescriptionTest.php
@@ -330,4 +330,26 @@ public function testGetFieldMapping()
 
         $this->assertEquals($fieldMapping, $field->getFieldMapping());
     }
+
+    public function testGetValueForEmbeddedObject()
+    {
+        $mockedEmbeddedObject = $this->getMock('MockedTestObject', array('myMethod'));
+        $mockedEmbeddedObject->expects($this->once())
+                    ->method('myMethod')
+                    ->will($this->returnValue('myMethodValue'));
+
+        $mockedObject = $this->getMock('MockedTestObject', array('getMyEmbeddedObject'));
+        $mockedObject->expects($this->once())
+            ->method('getMyEmbeddedObject')
+            ->will($this->returnValue($mockedEmbeddedObject));
+
+        $field = new FieldDescription();
+        $field->setFieldMapping(array(
+            'declaredField' => 'myEmbeddedObject', 'type' => 'string', 'fieldName' => 'myEmbeddedObject.myMethod'
+        ));
+        $field->setFieldName('myMethod');
+        $field->setOption('code', 'myMethod');
+
+        $this->assertEquals('myMethodValue', $field->getValue($mockedObject));
+    }
 }