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

Change mapper from object to class

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-05-12 10:54:43 +02:00
parent 9530b27471
commit 9d7ed814d4
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
DataStorage/Database/DataMapperAbstract.php
View File

@ -368,8 +368,8 @@ class DataMapperAbstract implements DataMapperInterface
/* Create extended */ /* Create extended */
foreach (static::$isExtending as $member => $rel) { foreach (static::$isExtending as $member => $rel) {
/** @var DataMapperAbstract $mapper */ /** @var DataMapperAbstract $mapper */
$mapper = new $rel['mapper'](self::$db); $mapper = $rel['mapper'];
$extendedIds[$member] = $mapper->create($obj, $relations); $extendedIds[$member] = $mapper::create($obj, $relations);
} }
foreach ($properties as $property) { foreach ($properties as $property) {
@ -385,7 +385,6 @@ class DataMapperAbstract implements DataMapperInterface
/* only insert if not already inserted */ /* only insert if not already inserted */
/** @var DataMapperAbstract $mapper */ /** @var DataMapperAbstract $mapper */
$mapper = static::$hasOne[$pname]['mapper']; $mapper = static::$hasOne[$pname]['mapper'];
$mapper = new $mapper(self::$db);
$relReflectionClass = new \ReflectionClass(get_class($relObj)); $relReflectionClass = new \ReflectionClass(get_class($relObj));
/** @var array $columns */ /** @var array $columns */
@ -395,7 +394,7 @@ class DataMapperAbstract implements DataMapperInterface
$relProperty->setAccessible(false); $relProperty->setAccessible(false);
if (empty($primaryKey)) { if (empty($primaryKey)) {
$primaryKey = $mapper->create($property->getValue($obj)); $primaryKey = $mapper::create($property->getValue($obj));
} }
//$property->setValue($obj, $primaryKey); //$property->setValue($obj, $primaryKey);
@ -455,7 +454,6 @@ class DataMapperAbstract implements DataMapperInterface
// todo: only create if object doesn't exists... get primaryKey field, then get member name based on this // todo: only create if object doesn't exists... get primaryKey field, then get member name based on this
// now check if id is null or set. // now check if id is null or set.
$mapper = static::$hasMany[$pname]['mapper']; $mapper = static::$hasMany[$pname]['mapper'];
$mapper = new $mapper(self::$db);
$objsIds = []; $objsIds = [];
if (isset(static::$hasMany[$pname]['mapper']) && static::$hasMany[$pname]['mapper'] === static::$hasMany[$pname]['relationmapper']) { if (isset(static::$hasMany[$pname]['mapper']) && static::$hasMany[$pname]['mapper'] === static::$hasMany[$pname]['relationmapper']) {
@ -485,7 +483,7 @@ class DataMapperAbstract implements DataMapperInterface
$relProperty->setAccessible(false); $relProperty->setAccessible(false);
} }
$objsIds[$key] = $mapper->create($value); $objsIds[$key] = $mapper::create($value);
} }
} elseif (is_scalar($temp)) { } elseif (is_scalar($temp)) {
$objsIds = $values; $objsIds = $values;
@ -656,8 +654,8 @@ class DataMapperAbstract implements DataMapperInterface
$reflectionProperty = $reflectionClass->getProperty($member); $reflectionProperty = $reflectionClass->getProperty($member);
/** @var DataMapperAbstract $mapper */ /** @var DataMapperAbstract $mapper */
$mapper = new $rel['mapper'](self::$db); $mapper = $rel['mapper'];
$mapper->get($reflectionProperty->getValue($obj), $relations, $obj); $mapper::get($reflectionProperty->getValue($obj), $relations, $obj);
} }
} }
@ -679,8 +677,6 @@ class DataMapperAbstract implements DataMapperInterface
foreach ($result as $member => $values) { foreach ($result as $member => $values) {
if ($reflectionClass->hasProperty($member)) { if ($reflectionClass->hasProperty($member)) {
$mapper = static::$hasMany[$member]['mapper']; $mapper = static::$hasMany[$member]['mapper'];
/** @var DataMapperAbstract $mapper */
$mapper = new $mapper(self::$db);
$reflectionProperty = $reflectionClass->getProperty($member); $reflectionProperty = $reflectionClass->getProperty($member);
if (!($accessible = $reflectionProperty->isPublic())) { if (!($accessible = $reflectionProperty->isPublic())) {
@ -689,16 +685,16 @@ class DataMapperAbstract implements DataMapperInterface
// relation table vs relation defined in same table as object e.g. comments // relation table vs relation defined in same table as object e.g. comments
if ($values !== false) { if ($values !== false) {
$objects = $mapper->get($values); $objects = $mapper::get($values);
$reflectionProperty->setValue($obj, $objects); $reflectionProperty->setValue($obj, $objects);
} else { } else {
// todo: replace getId() with lookup by primaryKey and the assoziated member variable and get value // todo: replace getId() with lookup by primaryKey and the assoziated member variable and get value
$query = $mapper->find()->where(static::$hasMany[$member]['table'] . '.' . static::$hasMany[$member]['dst'], '=', $obj->getId()); $query = $mapper::find()->where(static::$hasMany[$member]['table'] . '.' . static::$hasMany[$member]['dst'], '=', $obj->getId());
$sth = self::$db->con->prepare($query->toSql()); $sth = self::$db->con->prepare($query->toSql());
$sth->execute(); $sth->execute();
$results = $sth->fetchAll(\PDO::FETCH_ASSOC); $results = $sth->fetchAll(\PDO::FETCH_ASSOC);
$objects = $mapper->populateIterable($results); $objects = $mapper::populateIterable($results);
$reflectionProperty->setValue($obj, $objects); $reflectionProperty->setValue($obj, $objects);
} }
@ -734,9 +730,8 @@ class DataMapperAbstract implements DataMapperInterface
/** @var DataMapperAbstract $mapper */ /** @var DataMapperAbstract $mapper */
$mapper = static::$hasOne[$member]['mapper']; $mapper = static::$hasOne[$member]['mapper'];
$mapper = new $mapper(self::$db);
$value = $mapper->get($reflectionProperty->getValue($obj)); $value = $mapper::get($reflectionProperty->getValue($obj));
$reflectionProperty->setValue($obj, $value); $reflectionProperty->setValue($obj, $value);
if (!$accessible) { if (!$accessible) {