Update identity map and unit of work. Fix datatype issues

Author: Marco Bunge

src/AbstractMapper.php

@@ -74,7 +74,7 @@ public function __construct(Connection $connection, Hydrator $hydrator = null)
         $this->doDefine();
 
         $this->gateway = new Gateway($this->connection, $this->getTableName());
-        $this->identityMap = new IdentityMap();
+        $this->identityMap = $connection->loadIdentityMap($this->getEntityClass());
     }
 
     /**

src/Connection.php

@@ -36,6 +36,11 @@ final class Connection extends \Doctrine\DBAL\Connection
      */
     private $objectGraph;
 
+    /**
+     * @var IdentityMap[]
+     */
+    private $identityMap;
+
     /**
      * @return null|string
      */
@@ -74,6 +79,27 @@ public function getMapperLocator()
         return $this->mapperLocator;
     }
 
+
+    /**
+     * @param $classOrObject
+     * @return IdentityMap
+     */
+    public function loadIdentityMap($classOrObject)
+    {
+        if (is_object($classOrObject)) {
+            $classOrObject = get_class($classOrObject);
+        }
+
+        if (!is_string($classOrObject)) {
+            throw new \InvalidArgumentException('Invalid data type ' . gettype($classOrObject));
+        }
+        if(!isset($this->identityMap[$classOrObject])){
+            $this->identityMap[$classOrObject] = new IdentityMap();
+        }
+
+        return $this->identityMap[$classOrObject];
+    }
+
     /**
      * @return UnitOfWork
      */
@@ -94,19 +120,16 @@ public function getObjectGraph(){
     /**
      * @return array
      */
-    public function getIdentityStateGraph(){
-        $mappers = $this->getMapperLocator()->getMapperMap();
+    public function getEntityStateGraph(){
         $objectGraph = $this->getObjectGraph();
         $graph = [];
 
-        foreach ($mappers as $mapper){
-            $identities = $mapper->getIdentityMap()->toArray();
+        foreach ($this->identityMap as $identityMap){
+            $identities = $identityMap->toArray();
 
             foreach ($identities as $id => $object){
-                $identities[$id] = $objectGraph->getState($object);
+                $graph[get_class($object)][$id] = $objectGraph->getState($object);
             }
-
-            $graph[$mapper->getEntityClass()] = $identities;
         }
 
         return $graph;

src/MapperLocator.php

@@ -170,23 +170,4 @@ private function isValid($mapper)
         return '\\' . ltrim($mapper, '\\') instanceof Mapper;
     }
 
-    /**
-     * INTERNAL: Mapping between entities and mappers
-     * @return array
-     */
-    public function getEntityMapperMap()
-    {
-        return $this->entityMapperMap;
-    }
-
-    /**
-     * INTERNAL: An in memory cache of mapper objects
-     *
-     * @return Mapper[]
-     */
-    public function getMapperMap()
-    {
-        return $this->mapperMap;
-    }
-
 }

src/ObjectGraph.php

@@ -57,6 +57,9 @@ public function getState($object){
         return self::UNHANDLED;
     }
 
+    /**
+     * @return mixed
+     */
     public function toArray(){
         $copy = [];
 

tests/IntegrationTest.php

@@ -63,7 +63,7 @@ public function testIntegration()
 
         /** @var PostEntity $createdEntity */
         $createdEntity = $mapper->create($entity);
-        $graph = $connection->getIdentityStateGraph();
+        $graph = $connection->getEntityStateGraph();
 
         $this->assertEquals($connection->lastInsertId(), $entity->getId());
         $this->assertEquals($entity, $createdEntity);
@@ -82,7 +82,7 @@ public function testIntegration()
 
         /** @var PostEntity $updatedEntity */
         $updatedEntity = $mapper->update($entity);
-        $graph = $connection->getIdentityStateGraph();
+        $graph = $connection->getEntityStateGraph();
 
         $this->assertEquals($entity, $updatedEntity);
         $this->assertEquals($updatedEntity->getContent(), 'FOO');
@@ -93,7 +93,7 @@ public function testIntegration()
 
         $mapper->delete($entity);
 
-        $graph = $connection->getIdentityStateGraph();
+        $graph = $connection->getEntityStateGraph();
 
         if(true){