Merge branch '2.3' of github.com:darkwebdesign/symfony-addon-pack into ISSUE-2

Author: raymondschouten

src/EntityToIdentifierTransformer.php

@@ -58,9 +58,9 @@ class EntityToIdentifierTransformer implements DataTransformerInterface
     public function __construct(ObjectManager $entityManager, $className)
     {
         $this->entityManager = $entityManager;
-        $this->className = $className;
-        $this->repository = $this->entityManager->getRepository($this->className);
-        $this->metadata = $this->entityManager->getClassMetadata($this->className);
+        $this->repository = $this->entityManager->getRepository($className);
+        $this->metadata = $this->entityManager->getClassMetadata($className);
+        $this->className = $this->metadata->getName();
 
         if ($this->metadata->isIdentifierComposite) {
             throw new InvalidArgumentException('Expected an entity with a single identifier.');
@@ -86,9 +86,9 @@ public function transform($value)
             throw new TransformationFailedException('Expected an object.');
         }
 
-        $class = ClassUtils::getClass($value);
+        $className = ClassUtils::getClass($value);
 
-        if ($class !== $this->className) {
+        if ($className !== $this->className) {
             throw new TransformationFailedException(sprintf('Expected entity %s.', $this->className));
         }
 

tests/EntityToIdentifierTransformerTest.php

@@ -61,6 +61,7 @@ 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->isIdentifierComposite = false;
@@ -86,6 +87,15 @@ public function testTransform()
         $this->assertSame($this->identifier, $identifier);
     }
 
+    public function testTransformAlias()
+    {
+        $transformer = new EntityToIdentifierTransformer($this->entityManager, 'AppBundle:City');
+
+        $identifier = $transformer->transform($this->entity);
+
+        $this->assertSame($this->identifier, $identifier);
+    }
+
     public function testTransformNull()
     {
         $transformer = new EntityToIdentifierTransformer($this->entityManager, $this->className);