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

Return null obj in datamapper

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-09-28 11:00:07 +02:00
parent 0733b0e705
commit 69123a0b24
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DataStorage/Database/DataMapperAbstract.php
View File

@ -1878,7 +1878,7 @@ class DataMapperAbstract implements DataMapperInterface
$countResulsts = count($obj); $countResulsts = count($obj);
if($countResulsts === 0) { if($countResulsts === 0) {
return null; return self::getNullModelObj();
} elseif($countResulsts === 1) { } elseif($countResulsts === 1) {
return reset($obj); return reset($obj);
} }
@ -1886,6 +1886,18 @@ class DataMapperAbstract implements DataMapperInterface
return $obj; return $obj;
} }
private static function getNullModelObj()
{
$class = static::class;
$class = str_replace('Mapper', '', $class);
$parts = explode('\\', $class);
$name = $parts[$c = (count($parts) - 1)];
$parts[$c] = 'Null' . $name;
$class = implode('\\', $parts);
return new $class();
}
/** /**
* Get object. * Get object.
* *
@ -1961,7 +1973,7 @@ class DataMapperAbstract implements DataMapperInterface
$countResulsts = count($obj); $countResulsts = count($obj);
if($countResulsts === 0) { if($countResulsts === 0) {
return null; return self::getNullModelObj();
} elseif($countResulsts === 1) { } elseif($countResulsts === 1) {
return reset($obj); return reset($obj);
} }
@ -2465,13 +2477,7 @@ class DataMapperAbstract implements DataMapperInterface
$result = static::getAllByQuery($query); $result = static::getAllByQuery($query);
} }
} else { } else {
$class = static::class; return self::getNullModelObj();
$class = str_replace('Mapper', '', $class);
$parts = explode('\\', $class);
$name = $parts[$c = (count($parts) - 1)];
$parts[$c] = 'Null' . $name;
$class = implode('\\', $parts);
$result = new $class();
} }
return $result; return $result;