Update identity map and unit of work. Fix datatype issues

Author: Marco Bunge

README.md

@@ -7,24 +7,24 @@
 [![Coverage Status][ico-coveralls]][link-coveralls]
 
 Persistence layer for Hawkbit PSR-7 Micro PHP framework.
-Hawkbit Persitence uses factories of `dasprid/container-interop-doctrine` and wraps them with in a PersistenceService
+Features unit of work, identity map, object graph, popo's and mapper. 
 
 ## Install
 
 ### Using Composer
 
-Hawkbit Persistence is available on [Packagist][link-packagist] and can be installed using [Composer](https://getcomposer.org/). This can be done by running the following command or by updating your `composer.json` file.
+Hawkbit Database is available on [Packagist][link-packagist] and can be installed using [Composer](https://getcomposer.org/). This can be done by running the following command or by updating your `composer.json` file.
 
 ```bash
-composer require hawkbit/persistence
+composer require hawkbit/database
 ```
 
 composer.json
 
 ```javascript
 {
     "require": {
-        "hawkbit/persistence": "~1.0"
+        "hawkbit/database": "~1.0"
     }
 }
 ```
@@ -52,77 +52,90 @@ The following versions of PHP are supported by this version.
 
 ## Setup
 
-Setup with an existing application configuration (we refer to [tests/assets/config.php](tests/assets/config.php))
+Create a Mapper and an entity. See 
+
+Create a Connection and register mappers
 
 ```php
 <?php
 
-use \Hawkbit\Application;
-use \Hawkbit\Persistence\PersistenceService;
-use \Hawkbit\Persistence\PersistenceServiceProvider;
+use Hawkbit\Storage\ConnectionManager;
+use Application\Persistence\Mappers\PostMapper;
 
-$app = new Application(require_once __DIR__ . '/config.php');
+$connection = ConnectionManager::create([
+    'url' => 'sqlite:///:memory:',
+    'memory' => 'true'
+]);
 
-$entityFactoryClass = \ContainerInteropDoctrine\EntityManagerFactory::class;
+$connection->getMapperLocator()->register(PostMapper::class);
+```
 
-$persistenceService = new PersistenceService([
-   PersistenceService::resolveFactoryAlias($entityFactoryClass) => [$entityFactoryClass]
-], $app);
+Load Mapper by mapper class or entity class
 
-$app->register(new PersistenceServiceProvider($persistenceService));
-```
+```php
+<?php
+
+use Application\Persistence\Mappers\PostMapper;
+use Application\Persistence\Entities\Post;
 
-## Examples
+// load by mapper
+$mapper = $connection->loadMapper(PostMapper::class);
 
-### Full configuration
+// load by entity
+$mapper = $connection->loadMapper(Post::class);
+
+```
 
-A full configuration is available on [DASPRiD/container-interop-doctrine/example/full-config.php](https://github.com/DASPRiD/container-interop-doctrine/blob/master/example/full-config.php). 
-Refer to [container-interop-doctrine Documentation](https://github.com/DASPRiD/container-interop-doctrine) for further instructions on factories.
+## Data manipulation
 
-### Persistence from Hawbit Application
+### Create entity
 
 ```php
 <?php
 
-/** @var \Hawkbit\Persistence\PersistenceServiceInterface $persistence */
-$persistence = $app[\Hawkbit\Persistence\PersistenceServiceInterface::class];
+use Application\Persistence\Entities\Post;
 
-$em = $persistence->getEntityManager();
+$entity = new Post();
 
-// or with from specific connection
-$em = $persistence->getEntityManager('connectionname');
+$entity->setContent('cnt');
+
+/** @var Post $createdEntity */
+$mapper->create($entity);
 
 ```
 
-### Persistence in a Hawkbit controller
 
-Access persistence service in controller. Hawbit is inject classes to controllers by default.
+### Load entity
 
 ```php
 <?php
 
-use \Hawkbit\Persistence\PersistenceServiceInterface;
-
-class MyController{
-    
-    /**
-     * @var \Hawkbit\Persistence\PersistenceServiceInterface 
-     */
-    private $persistence = null;
-    
-    public function __construct(PersistenceServiceInterface $persistence){
-        $this->persistence = $persistence;
-    }
-    
-    public function index(){
-        $em = $this->persistence->getEntityManager();
-        
-        // or with from specific connection
-        $em = $this->persistence->getEntityManager('connectionname');
-    }
-}
+$entity = $mapper->find(['id' => 1]);
+
 ```
 
+
+### Update entity
+
+```php
+<?php
+
+$entity->setContent('FOO');
+$mapper->update($entity);
+
+```
+
+### Delete entity
+
+```php
+<?php
+
+$mapper->delete($entity);
+
+```
+
+## Transactions
+
 ## Change log
 
 Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recently.

example/Persistence/Entities/Post.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: marco.bunge
+ * Date: 05.12.2016
+ * Time: 10:07
+ */
+
+namespace Application\Persistence\Entities;
+
+
+class Post
+{
+
+    /**
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @var string
+     */
+    private $content = '';
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return Post
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    /**
+     * @param string $content
+     * @return Post
+     */
+    public function setContent($content)
+    {
+        $this->content = $content;
+        return $this;
+    }
+
+}

example/Persistence/Mappers/PostMapper.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: marco.bunge
+ * Date: 07.12.2016
+ * Time: 09:44
+ */
+
+namespace Application\Persistence\Mappers;
+
+
+use Application\Persistence\Entities\Post;
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Types\Type;
+use Hawkbit\Storage\AbstractMapper;
+
+class PostMapper extends AbstractMapper
+{
+    public function define()
+    {
+        $this->tableName = 'post';
+        $this->columns = [
+            new Column('id', Type::getType(Type::INTEGER)),
+            new Column('content', Type::getType(Type::TEXT)),
+        ];
+        $this->primaryKey = ['id'];
+        $this->entityClass = Post::class;
+    }
+}

example/bootstrap.php

@@ -0,0 +1,41 @@
+<?php
+
+use Application\Persistence\Entities\Post;
+use Application\Persistence\Mappers\PostMapper;
+use Hawkbit\Storage\ConnectionManager;
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+/*
+ * Tis is only an example. All steps are separated in their specific logic
+ */
+
+// setup connection
+$connection = ConnectionManager::create([
+    'url' => 'sqlite:///:memory:',
+    'memory' => 'true'
+]);
+
+// setup schema
+$connection->exec('CREATE TABLE post (id int, title VARCHAR(255), content TEXT, date DATETIME DEFAULT CURRENT_DATE )');
+
+// register mappers
+$connection->getMapperLocator()->register(PostMapper::class);
+
+// load mapper
+$entity = new Post();
+$mapper = $connection->loadMapper($entity);
+
+// create entity
+$entity->setContent('cnt');
+$mapper->create($entity);
+
+// find entity by primary key or compound key
+$mapper->find(['id' => 1]);
+
+// update entity
+$entity->setContent('FOO');
+$mapper->update($entity);
+
+// delete entity
+$mapper->delete($entity);