From 452e541ecdb5911ec104eb01b1fa886bcb1b5443 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 12 Jun 2020 18:21:16 +0200
Subject: [PATCH] fix bug where nullmodels would break updating

---
 DataStorage/Database/DataMapperAbstract.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/DataStorage/Database/DataMapperAbstract.php b/DataStorage/Database/DataMapperAbstract.php
index 1d61a1e6e..b21ec1a94 100644
--- a/DataStorage/Database/DataMapperAbstract.php
+++ b/DataStorage/Database/DataMapperAbstract.php
@@ -445,7 +445,7 @@ class DataMapperAbstract implements DataMapperInterface
      */
     public static function create($obj, int $relations = RelationType::ALL)
     {
-        if (!isset($obj) || self::isNullModel($obj)) {
+        if (!isset($obj)) {
             return null;
         }
 
@@ -453,6 +453,10 @@ class DataMapperAbstract implements DataMapperInterface
 
         $refClass = new \ReflectionClass($obj);
 
+        if (self::isNullModel($obj)) {
+            return self::getObjectId($obj, $refClass);
+        }
+
         if (!empty($id = self::getObjectId($obj, $refClass)) && static::$autoincrement) {
             $objId = $id;
         } else {
@@ -1384,7 +1388,7 @@ class DataMapperAbstract implements DataMapperInterface
         $query->update(static::$table)
             ->where(static::$table . '.' . static::$primaryField, '=', $objId);
 
-        foreach (static::$columns as $key => $column) {
+        foreach (static::$columns as $column) {
             $propertyName = \stripos($column['internal'], '/') !== false ? \explode('/', $column['internal'])[0] : $column['internal'];
             if (isset(static::$hasMany[$propertyName])
                 || $column['internal'] === static::$primaryField
@@ -1519,7 +1523,7 @@ class DataMapperAbstract implements DataMapperInterface
      */
     public static function update($obj, int $relations = RelationType::ALL, int $depth = 3)
     {
-        if (!isset($obj) || self::isNullModel($obj)) {
+        if (!isset($obj)) {
             return null;
         }
 
@@ -1528,7 +1532,7 @@ class DataMapperAbstract implements DataMapperInterface
         $refClass = new \ReflectionClass($obj);
         $objId    = self::getObjectId($obj, $refClass);
 
-        if ($depth < 1) {
+        if ($depth < 1 || self::isNullModel($obj)) {
             return $objId;
         }