Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-05-25 18:58:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix update null/null objs

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-12-02 15:41:43 +01:00
parent e556fbed49
commit 9a460a2dc7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataStorage/DataMapperInterface.php
View File

@ -47,11 +47,11 @@ interface DataMapperInterface
* *
* @param mixed $obj Object reference (gets filled with insert id) * @param mixed $obj Object reference (gets filled with insert id)
* *
* @return int Status * @return mixed
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function update($obj) : int; public static function update($obj);
/** /**
* Delete data. * Delete data.

10
DataStorage/Database/DataMapperAbstract.php
View File

@ -346,7 +346,7 @@ class DataMapperAbstract implements DataMapperInterface
{ {
self::extend(__CLASS__); self::extend(__CLASS__);
if ($obj === null || if (!isset($obj) ||
(strpos($className = get_class($obj), '\Null') !== false && is_object($obj)) (strpos($className = get_class($obj), '\Null') !== false && is_object($obj))
) { ) {
return null; return null;
@ -1152,14 +1152,18 @@ class DataMapperAbstract implements DataMapperInterface
* @param mixed $obj Object reference (gets filled with insert id) * @param mixed $obj Object reference (gets filled with insert id)
* @param int $relations Create all relations as well * @param int $relations Create all relations as well
* *
* @return int * @return mixed
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function update($obj, int $relations = RelationType::ALL) : int public static function update($obj, int $relations = RelationType::ALL)
{ {
self::extend(__CLASS__); self::extend(__CLASS__);
if(!isset($obj) || strpos(get_class($obj), '\Null') !== false) {
return null;
}
$reflectionClass = new \ReflectionClass($obj); $reflectionClass = new \ReflectionClass($obj);
$objId = self::getObjectId($obj, $reflectionClass); $objId = self::getObjectId($obj, $reflectionClass);
$update = true; $update = true;