ISSUE-89: Added support for discriminated entities

Author: raymondschouten

src/EntityToIdentifierTransformer.php

@@ -88,7 +88,7 @@ public function transform($value)
 
         $className = ClassUtils::getClass($value);
 
-        if ($className !== $this->className) {
+        if ($className !== $this->className && !is_subclass_of($className, $this->className)) {
             throw new TransformationFailedException(sprintf('Expected entity %s.', $this->className));
         }
 

tests/EntityToIdentifierTransformerTest.php

@@ -22,6 +22,7 @@
 
 use DarkWebDesign\SymfonyAddon\Transformer\EntityToIdentifierTransformer;
 use DarkWebDesign\SymfonyAddon\Transformer\Tests\Models\City;
+use DarkWebDesign\SymfonyAddon\Transformer\Tests\Models\Employee;
 use DarkWebDesign\SymfonyAddon\Transformer\Tests\Models\PointOfInterest;
 use PHPUnit_Framework_TestCase;
 use stdClass;
@@ -61,12 +62,28 @@ protected function setUp()
         $this->entityManager->method('getRepository')->willReturn($this->repository);
         $this->entityManager->method('getClassMetadata')->willReturn($this->metadata);
 
-        $this->metadata->method('getName')->willReturn($this->className);
-        $this->metadata->method('getIdentifierValues')->willReturn(array('id' => $this->identifier));
+        $this->metadata->method('getName')->willReturnCallback(array($this, 'getClassName'));
+        $this->metadata->method('getIdentifierValues')->willReturnCallback(array($this, 'getIdentifier'));
 
         $this->metadata->isIdentifierComposite = false;
     }
 
+    /**
+     * @return string
+     */
+    public function getClassName()
+    {
+        return $this->className;
+    }
+
+    /**
+     * @return array
+     */
+    public function getIdentifier()
+    {
+        return array('id' => $this->identifier);
+    }
+
     /**
      * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
      * @expectedExceptionMessage Expected an entity with a single identifier.
@@ -96,6 +113,19 @@ public function testTransformAlias()
         $this->assertSame($this->identifier, $identifier);
     }
 
+    public function testTransformDiscriminated()
+    {
+        $this->className = 'DarkWebDesign\SymfonyAddon\Transformer\Tests\Models\AbstractPerson';
+
+        $transformer = new EntityToIdentifierTransformer($this->entityManager, $this->className);
+
+        $entity = new Employee();
+
+        $identifier = $transformer->transform($entity);
+
+        $this->assertSame($this->identifier, $identifier);
+    }
+
     public function testTransformNull()
     {
         $transformer = new EntityToIdentifierTransformer($this->entityManager, $this->className);

tests/Models/AbstractPerson.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace DarkWebDesign\SymfonyAddon\Transformer\Tests\Models;
+
+/**
+ * @Table(name="person")
+ *
+ * @Entity
+ *
+ * @InheritanceType("SINGLE_TABLE")
+ *
+ * @DiscriminatorColumn(name="type", type="string")
+ * @DiscriminatorMap({"person" = "Person", "employee" = "Employee"}) */
+abstract class AbstractPerson
+{
+    /**
+     * @var int
+     *
+     * @Column(name="id", type="integer", nullable=false)
+     *
+     * @Id
+     *
+     * @GeneratedValue(strategy="IDENTITY")
+     */
+    protected $id;
+
+    /**
+     * @var string
+     *
+     * @Column(name="name", type="string", length=50, nullable=false)
+     */
+    protected $name;
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+}

tests/Models/Employee.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace DarkWebDesign\SymfonyAddon\Transformer\Tests\Models;
+
+/**
+ * @Table(name="employee")
+ *
+ * @Entity
+ */
+class Employee extends AbstractPerson
+{
+    /**
+     * @var string
+     *
+     * @Column(name="function", type="string", length=50, nullable=false)
+     */
+    private $function;
+
+    /**
+     * @return string
+     */
+    public function getFunction()
+    {
+        return $this->function;
+    }
+
+    /**
+     * @param string $function
+     */
+    public function setFunction($function)
+    {
+        $this->function = $function;
+    }
+}