Update identity map and unit of work. Fix datatype issues

Marco Bunge · Marco Bunge · commit 3624ed10c57e · 2016-12-08T14:52:48.000+01:00
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ Create a Connection and register mappers
 ```php
 <?php
 
-use Hawkbit\Storage\ConnectionManager;
+use Hawkbit\Database\ConnectionManager;
 use Application\Persistence\Mappers\PostMapper;
 
 $connection = ConnectionManager::create([
diff --git a/composer.json b/composer.json
@@ -28,12 +28,12 @@
   },
   "autoload": {
     "psr-4": {
-      "Hawkbit\\Storage\\": "src/"
+      "Hawkbit\\Database\\": "src/"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Hawkbit\\Storage\\Tests\\": "tests/"
+      "Hawkbit\\Database\\Tests\\": "tests/"
     }
   },
   "scripts": {
diff --git a/example/Persistence/Mappers/PostMapper.php b/example/Persistence/Mappers/PostMapper.php
@@ -12,7 +12,7 @@
 use Application\Persistence\Entities\Post;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Types\Type;
-use Hawkbit\Storage\AbstractMapper;
+use Hawkbit\Database\AbstractMapper;
 
 class PostMapper extends AbstractMapper
 {
diff --git a/example/bootstrap.php b/example/bootstrap.php
@@ -2,7 +2,7 @@
 
 use Application\Persistence\Entities\Post;
 use Application\Persistence\Mappers\PostMapper;
-use Hawkbit\Storage\ConnectionManager;
+use Hawkbit\Database\ConnectionManager;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
diff --git a/src/AbstractMapper.php b/src/AbstractMapper.php
@@ -6,7 +6,7 @@
  * Time: 15:25
  */
 
-namespace Hawkbit\Storage;
+namespace Hawkbit\Database;
 
 
 use Doctrine\Common\Inflector\Inflector;
@@ -167,8 +167,10 @@ final public function getColumns()
      */
     final public function createEntity($id = null){
         $identityMap = $this->getIdentityMap();
-        if($identityMap->hasId($id)){
-            return $identityMap->getObject($id);
+        if(null !== $id){
+            if($identityMap->hasId($id)){
+                return $identityMap->getObject($id);
+            }
         }
         $class = $this->getEntityClass();
         return new $class;
diff --git a/src/Connection.php b/src/Connection.php
@@ -6,7 +6,7 @@
  * Time: 14:04
  */
 
-namespace Hawkbit\Storage;
+namespace Hawkbit\Database;
 
 use Doctrine\DBAL\Driver;
 
@@ -31,11 +31,6 @@ final class Connection extends \Doctrine\DBAL\Connection
      */
     private $mapperLocator;
 
-    /**
-     * @var EntityStates
-     */
-    private $objectGraph;
-
     /**
      * @var IdentityMap[]
      */
@@ -107,14 +102,4 @@ public function createUnitOfWork(){
         return new UnitOfWork($this);
     }
 
-    /**
-     * @return EntityStates
-     */
-    public function getObjectGraph(){
-        if(null === $this->objectGraph){
-            $this->objectGraph = new EntityStates($this);
-        }
-        return $this->objectGraph;
-    }
-
 }
diff --git a/src/ConnectionManager.php b/src/ConnectionManager.php
@@ -6,7 +6,7 @@
  * Time: 14:00
  */
 
-namespace Hawkbit\Storage;
+namespace Hawkbit\Database;
 
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\DriverManager;
@@ -40,7 +40,7 @@ final class ConnectionManager
      * Get connection manager instance to share
      * connections between different instances.
      *
-     * @return \Hawkbit\Storage\ConnectionManager
+     * @return \Hawkbit\Database\ConnectionManager
      */
     public static function getInstance()
     {
diff --git a/src/EntityStates.php b/src/EntityStates.php
diff --git a/src/Gateway.php b/src/Gateway.php
@@ -6,11 +6,11 @@
  * Time: 10:29
  */
 
-namespace Hawkbit\Storage;
+namespace Hawkbit\Database;
 
 /**
  * Grant low-level access to data base
- * @package Hawkbit\Storage
+ * @package Hawkbit\Database
  */
 final class Gateway
 {
diff --git a/src/Hydrator.php b/src/Hydrator.php
@@ -6,18 +6,18 @@
  * Time: 13:44
  */
 
-namespace Hawkbit\Storage;
+namespace Hawkbit\Database;
 
 
-use Hawkbit\Storage\Support\MapperStore;
-use Hawkbit\Storage\Support\ReflectionStore;
+use Hawkbit\Database\Support\MapperStore;
+use Hawkbit\Database\Support\ReflectionStore;
 
 /**
  * Class Hydrator
  *
  * Hydrate or extract from object properties
  *
- * @package Hawkbit\Storage
+ * @package Hawkbit\Database
  */
 class Hydrator
 {
diff --git a/src/IdentityMap.php b/src/IdentityMap.php
@@ -6,7 +6,7 @@
  * Time: 07:35
  */
 
-namespace Hawkbit\Storage;
+namespace Hawkbit\Database;
 
 
 use ArrayObject;
@@ -89,13 +89,13 @@ public function set($id, $object)
     {
         if ($this->hasObject($object)) {
             $this->modify($object);
-        }else{
+        } else {
             $this->add($object);
         }
 
         // remove old id's
-        if($this->hasObject($object)){
-            if($this->getId($object) !== $id){
+        if ($this->hasObject($object)) {
+            if ($this->getId($object) !== $id) {
                 $this->removeId($id);
             }
         }
@@ -156,37 +156,49 @@ public function getObject($id)
     /**
      * Remove link from object to id
      * @param $object
+     * @return bool
      */
     private function removeObject($object)
     {
         if ($this->hasObject($object)) {
             unset($this->objectToId[$object]);
+            return true;
         }
+
+        return false;
     }
 
     /**
      * Remove link from id to object
      * @param $id
+     * @return bool
      */
     private function removeId($id)
     {
         if ($this->hasId($id)) {
             unset($this->idToObject[$id]);
+            return true;
         }
+
+        return false;
     }
 
     /**
      * remove object by id
      * @param $id
      * @param $object
      */
-    public function remove($id, $object){
-        $this->removeId($id);
-        $this->removeObject($object);
-        $this->removed[$id] = $object;
-
-        //update object state
-        $this->delete($object);
+    public function remove($id, $object)
+    {
+        if (
+            $this->removeId($id) &&
+            $this->removeObject($object)
+        ) {
+            $this->removed[$id] = $object;
+
+            //update object state
+            $this->delete($object);
+        }
     }
 
     /**
diff --git a/src/Mapper.php b/src/Mapper.php
@@ -6,7 +6,7 @@
  * Time: 12:11
  */
 
-namespace Hawkbit\Storage;
+namespace Hawkbit\Database;
 
 
 use Doctrine\DBAL\Schema\Column;
diff --git a/src/MapperLocator.php b/src/MapperLocator.php
@@ -6,7 +6,7 @@
  * Time: 07:11
  */
 
-namespace Hawkbit\Storage;
+namespace Hawkbit\Database;
 
 
 class MapperLocator
diff --git a/src/UnitOfWork.php b/src/UnitOfWork.php
diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
diff --git a/tests/Stubs/PostEntity.php b/tests/Stubs/PostEntity.php
diff --git a/tests/Stubs/PostMapper.php b/tests/Stubs/PostMapper.php
diff --git a/tests/Stubs/UserEntity.php b/tests/Stubs/UserEntity.php

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`use Application\Persistence\Entities\Post;`
`13`	`13`	`use Doctrine\DBAL\Schema\Column;`
`14`	`14`	`use Doctrine\DBAL\Types\Type;`
`15`		`-use Hawkbit\Storage\AbstractMapper;`
	`15`	`+use Hawkbit\Database\AbstractMapper;`
`16`	`16`
`17`	`17`	`class PostMapper extends AbstractMapper`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,18 +6,18 @@`
`6`	`6`	`* Time: 13:44`
`7`	`7`	`*/`
`8`	`8`
`9`		`-namespace Hawkbit\Storage;`
	`9`	`+namespace Hawkbit\Database;`
`10`	`10`
`11`	`11`
`12`		`-use Hawkbit\Storage\Support\MapperStore;`
`13`		`-use Hawkbit\Storage\Support\ReflectionStore;`
	`12`	`+use Hawkbit\Database\Support\MapperStore;`
	`13`	`+use Hawkbit\Database\Support\ReflectionStore;`
`14`	`14`
`15`	`15`	`/**`
`16`	`16`	`* Class Hydrator`
`17`	`17`	`*`
`18`	`18`	`* Hydrate or extract from object properties`
`19`	`19`	`*`
`20`		`- * @package Hawkbit\Storage`
	`20`	`+ * @package Hawkbit\Database`
`21`	`21`	`*/`
`22`	`22`	`class Hydrator`
`23`	`23`	`{`