DoctrineWrite fix for issue ddeboer#194

ecoco · Apr 30, 2015 · 10e2409 · 10e2409
1 parent 45069d8
commit 10e2409
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Ddeboer/DataImport/Writer/DoctrineWriter.php b/src/Ddeboer/DataImport/Writer/DoctrineWriter.php
@@ -87,9 +87,10 @@ class DoctrineWriter extends AbstractWriter
     public function __construct(EntityManagerInterface $entityManager, $entityName, $index = null)
     {
         $this->entityManager = $entityManager;
-        $this->entityName = $entityName;
         $this->entityRepository = $entityManager->getRepository($entityName);
         $this->entityMetadata = $entityManager->getClassMetadata($entityName);
+        //translate entityName in case a namespace alias is used
+        $this->entityName = $this->entityMetadata->getName();
         if($index) {
             if(is_array($index)) {
                 $this->lookupFields = $index;

diff --git a/tests/Ddeboer/DataImport/Tests/Writer/DoctrineWriterTest.php b/tests/Ddeboer/DataImport/Tests/Writer/DoctrineWriterTest.php
@@ -193,4 +193,19 @@ public function testLoadAssociationWithPresetObject()
 
         $writer->writeItem($item);
     }
+
+    /**
+     * Test to make sure that we are clearing the write entity
+     */
+    public function testFlushAndClear()
+    {
+        $em = $this->getEntityManager();
+
+        $em->expects($this->once())
+            ->method('clear')
+            ->with($this->equalTo('Ddeboer\DataImport\Tests\Fixtures\Entity\TestEntity'));
+
+        $writer = new DoctrineWriter($em, 'DdeboerDataImport:TestEntity');
+        $writer->finish();
+    }
 }