Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-11 22:38:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug with null models

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-06-13 15:16:03 +02:00
parent 452e541ecd
commit 9947c203fb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DataStorage/Database/DataMapperAbstract.php
View File

@ -454,7 +454,9 @@ class DataMapperAbstract implements DataMapperInterface
$refClass = new \ReflectionClass($obj); $refClass = new \ReflectionClass($obj);
if (self::isNullModel($obj)) { if (self::isNullModel($obj)) {
return self::getObjectId($obj, $refClass); $objId = self::getObjectId($obj, $refClass);
return $objId === 0 ? null : $objId;
} }
if (!empty($id = self::getObjectId($obj, $refClass)) && static::$autoincrement) { if (!empty($id = self::getObjectId($obj, $refClass)) && static::$autoincrement) {
@ -519,7 +521,7 @@ class DataMapperAbstract implements DataMapperInterface
$query = new Builder(self::$db); $query = new Builder(self::$db);
$query->into(static::$table); $query->into(static::$table);
foreach (static::$columns as $key => $column) { foreach (static::$columns as $column) {
$propertyName = \stripos($column['internal'], '/') !== false ? \explode('/', $column['internal'])[0] : $column['internal']; $propertyName = \stripos($column['internal'], '/') !== false ? \explode('/', $column['internal'])[0] : $column['internal'];
if (isset(static::$hasMany[$propertyName])) { if (isset(static::$hasMany[$propertyName])) {
continue; continue;
@ -1533,7 +1535,7 @@ class DataMapperAbstract implements DataMapperInterface
$objId = self::getObjectId($obj, $refClass); $objId = self::getObjectId($obj, $refClass);
if ($depth < 1 || self::isNullModel($obj)) { if ($depth < 1 || self::isNullModel($obj)) {
return $objId; return $objId === 0 ? null : $objId;
} }
self::addInitialized(static::class, $objId, $obj, $depth); self::addInitialized(static::class, $objId, $obj, $depth);