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

set empty result set as null

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-09-14 11:05:25 +02:00
parent cb0a443c55
commit 8a6659cdd2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DataStorage/Database/DataMapperAbstract.php
View File

@ -1703,7 +1703,7 @@ class DataMapperAbstract implements DataMapperInterface
} else { } else {
$value = $mapper::get($reflectionProperty->getValue($obj)); $value = $mapper::get($reflectionProperty->getValue($obj));
} }
$reflectionProperty->setValue($obj, $value); $reflectionProperty->setValue($obj, $value);
if (!$accessible) { if (!$accessible) {
@ -1765,10 +1765,10 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (in_array(static::$columns[$column]['type'], ['string', 'int', 'float', 'bool'])) { if (in_array(static::$columns[$column]['type'], ['string', 'int', 'float', 'bool'])) {
if($reflectionProperty->getValue($obj) !== null) { if($reflectionProperty->getValue($obj) !== null || $value !== null) {
settype($value, static::$columns[$column]['type']); settype($value, static::$columns[$column]['type']);
} }
$reflectionProperty->setValue($obj, $value); $reflectionProperty->setValue($obj, $value);
} elseif (static::$columns[$column]['type'] === 'DateTime') { } elseif (static::$columns[$column]['type'] === 'DateTime') {
$reflectionProperty->setValue($obj, new \DateTime($value ?? '')); $reflectionProperty->setValue($obj, new \DateTime($value ?? ''));
@ -1872,7 +1872,15 @@ class DataMapperAbstract implements DataMapperInterface
self::fillRelations($obj, $relations); self::fillRelations($obj, $relations);
self::clear(); self::clear();
return count($obj) === 1 ? reset($obj) : $obj; $countResulsts = count($obj);
if($countResulsts === 0) {
return null;
} elseif($countResulsts === 1) {
return reset($obj);
}
return $obj;
} }
/** /**