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

Fix #146

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-10-28 18:42:25 +02:00
parent 2e860aa782
commit 97d7bda3c6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DataStorage/Database/DataMapperAbstract.php
View File

@ -347,7 +347,7 @@ class DataMapperAbstract implements DataMapperInterface
self::extend(__CLASS__); self::extend(__CLASS__);
if ($obj === null || if ($obj === null ||
(is_object($obj) && strpos($className = get_class($obj), '\Null') !== false) (is_object($obj) && strpos($className = $obj, '\Null') !== false)
) { ) {
return null; return null;
} }
@ -505,7 +505,7 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
private static function getObjectId($obj, \ReflectionClass $reflectionClass = null) private static function getObjectId($obj, \ReflectionClass $reflectionClass = null)
{ {
$reflectionClass = $reflectionClass ?? new \ReflectionClass(get_class($obj)); $reflectionClass = $reflectionClass ?? new \ReflectionClass($obj);
$reflectionProperty = $reflectionClass->getProperty(static::$columns[static::$primaryField]['internal']); $reflectionProperty = $reflectionClass->getProperty(static::$columns[static::$primaryField]['internal']);
if (!($isPublic = $reflectionProperty->isPublic())) { if (!($isPublic = $reflectionProperty->isPublic())) {
@ -594,7 +594,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (!isset($relReflectionClass)) { if (!isset($relReflectionClass)) {
$relReflectionClass = new \ReflectionClass(get_class($value)); $relReflectionClass = new \ReflectionClass($value);
} }
$primaryKey = $mapper::getObjectId($value, $relReflectionClass); $primaryKey = $mapper::getObjectId($value, $relReflectionClass);
@ -929,7 +929,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (!isset($relReflectionClass)) { if (!isset($relReflectionClass)) {
$relReflectionClass = new \ReflectionClass(get_class($value)); $relReflectionClass = new \ReflectionClass($value);
} }
$primaryKey = $mapper::getObjectId($value, $relReflectionClass); $primaryKey = $mapper::getObjectId($value, $relReflectionClass);
@ -1160,7 +1160,7 @@ class DataMapperAbstract implements DataMapperInterface
{ {
self::extend(__CLASS__); self::extend(__CLASS__);
$reflectionClass = new \ReflectionClass(get_class($obj)); $reflectionClass = new \ReflectionClass($obj);
$objId = self::getObjectId($obj, $reflectionClass); $objId = self::getObjectId($obj, $reflectionClass);
$update = true; $update = true;
@ -1227,7 +1227,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (!isset($relReflectionClass)) { if (!isset($relReflectionClass)) {
$relReflectionClass = new \ReflectionClass(get_class($value)); $relReflectionClass = new \ReflectionClass($value);
} }
$primaryKey = $mapper::getObjectId($value, $relReflectionClass); $primaryKey = $mapper::getObjectId($value, $relReflectionClass);
@ -1370,7 +1370,7 @@ class DataMapperAbstract implements DataMapperInterface
{ {
self::extend(__CLASS__); self::extend(__CLASS__);
$reflectionClass = new \ReflectionClass(get_class($obj)); $reflectionClass = new \ReflectionClass($obj);
$objId = self::getObjectId($obj, $reflectionClass); $objId = self::getObjectId($obj, $reflectionClass);
if (empty($objId)) { if (empty($objId)) {
@ -1476,7 +1476,7 @@ class DataMapperAbstract implements DataMapperInterface
public static function populateManyToMany(array $result, &$obj) /* : void */ public static function populateManyToMany(array $result, &$obj) /* : void */
{ {
// todo: maybe pass reflectionClass as optional parameter for performance increase // todo: maybe pass reflectionClass as optional parameter for performance increase
$reflectionClass = new \ReflectionClass(get_class($obj)); $reflectionClass = new \ReflectionClass($obj);
foreach ($result as $member => $values) { foreach ($result as $member => $values) {
if (!empty($values) && $reflectionClass->hasProperty($member)) { if (!empty($values) && $reflectionClass->hasProperty($member)) {
@ -1544,7 +1544,7 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
public static function populateHasOne(&$obj) /* : void */ public static function populateHasOne(&$obj) /* : void */
{ {
$reflectionClass = new \ReflectionClass(get_class($obj)); $reflectionClass = new \ReflectionClass($obj);
foreach (static::$hasOne as $member => $one) { foreach (static::$hasOne as $member => $one) {
// todo: is that if necessary? performance is suffering for sure! // todo: is that if necessary? performance is suffering for sure!
@ -1613,7 +1613,7 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
public static function populateOwnsOne(&$obj) /* : void */ public static function populateOwnsOne(&$obj) /* : void */
{ {
$reflectionClass = new \ReflectionClass(get_class($obj)); $reflectionClass = new \ReflectionClass($obj);
foreach (static::$ownsOne as $member => $one) { foreach (static::$ownsOne as $member => $one) {
// todo: is that if necessary? performance is suffering for sure! // todo: is that if necessary? performance is suffering for sure!
@ -1682,7 +1682,7 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
public static function populateBelongsTo(&$obj) /* : void */ public static function populateBelongsTo(&$obj) /* : void */
{ {
$reflectionClass = new \ReflectionClass(get_class($obj)); $reflectionClass = new \ReflectionClass($obj);
foreach (static::$belongsTo as $member => $one) { foreach (static::$belongsTo as $member => $one) {
// todo: is that if necessary? performance is suffering for sure! // todo: is that if necessary? performance is suffering for sure!
@ -1752,7 +1752,7 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
public static function populateAbstract(array $result, $obj) public static function populateAbstract(array $result, $obj)
{ {
$reflectionClass = new \ReflectionClass(get_class($obj)); $reflectionClass = new \ReflectionClass($obj);
foreach ($result as $column => $value) { foreach ($result as $column => $value) {
if (isset(static::$columns[$column]['internal']) /* && $reflectionClass->hasProperty(static::$columns[$column]['internal']) */) { if (isset(static::$columns[$column]['internal']) /* && $reflectionClass->hasProperty(static::$columns[$column]['internal']) */) {