Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-11 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix datamapper bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-29 18:29:35 +01:00
parent 6443ab6c14
commit 1e19f72fc4
4 changed files with 119 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
DataStorage/Database/DataMapperAbstract.php
View File

@ -548,36 +548,42 @@ class DataMapperAbstract implements DataMapperInterface
}
$property = $refClass->getProperty($propertyName);
if (!($isPublic = $property->isPublic())) {
if (!$property->isPublic()) {
$property->setAccessible(true);
$tValue = $property->getValue($obj);
$property->setAccessible(false);
} else {
$tValue = $obj->$propertyName;
}
if (isset(static::$ownsOne[$propertyName])) {
$id = self::createOwnsOne($propertyName, $property->getValue($obj));
$id = self::createOwnsOne($propertyName, $tValue);
$value = self::parseValue($column['type'], $id);
$query->insert($column['name'])->value($value);
} elseif (isset(static::$belongsTo[$propertyName])) {
$id = self::createBelongsTo($propertyName, $property->getValue($obj));
$id = self::createBelongsTo($propertyName, $tValue);
$value = self::parseValue($column['type'], $id);
$query->insert($column['name'])->value($value);
} elseif ($column['name'] !== static::$primaryField || !empty($property->getValue($obj))) {
$tValue = $property->getValue($obj);
} elseif ($column['name'] !== static::$primaryField || !empty($tValue)) {
if (\stripos($column['internal'], '/') !== false) {
$path = \substr($column['internal'], \stripos($column['internal'], '/') + 1);
$tValue = ArrayUtils::getArray($path, $tValue, '/');
}
/*
if (($column['type'] === 'int' || $column['type'] === 'string')
&& \is_object($tValue) && \property_exists($tValue, 'id')
) {
$tValue =
}
*/
$value = self::parseValue($column['type'], $tValue);
$query->insert($column['name'])->value($value);
}
if (!$isPublic) {
$property->setAccessible(false);
}
}
// if a table only has a single column = primary key column. This must be done otherwise the query is empty
@ -665,16 +671,15 @@ class DataMapperAbstract implements DataMapperInterface
public static function getObjectId(object $obj, \ReflectionClass $refClass = null)
{
$refClass ??= new \ReflectionClass($obj);
$refProp = $refClass->getProperty(static::$columns[static::$primaryField]['internal']);
$propertyName = static::$columns[static::$primaryField]['internal'];
$refProp = $refClass->getProperty($propertyName);
if (!($isPublic = $refProp->isPublic())) {
if (!$refProp->isPublic()) {
$refProp->setAccessible(true);
}
$objectId = $refProp->getValue($obj);
if (!$isPublic) {
$refProp->setAccessible(false);
} else {
$objectId = $obj->$propertyName;
}
return $objectId;
@ -693,17 +698,16 @@ class DataMapperAbstract implements DataMapperInterface
*/
private static function setObjectId(\ReflectionClass $refClass, object $obj, $objId) : void
{
$refProp = $refClass->getProperty(static::$columns[static::$primaryField]['internal']);
if (!($isPublic = $refProp->isPublic())) {
$refProp->setAccessible(true);
}
$propertyName = static::$columns[static::$primaryField]['internal'];
$refProp = $refClass->getProperty($propertyName);
\settype($objId, static::$columns[static::$primaryField]['type']);
if (!$refProp->isPublic()) {
$refProp->setAccessible(true);
$refProp->setValue($obj, $objId);
if (!$isPublic) {
$refProp->setAccessible(false);
} else {
$obj->$propertyName = $objId;
}
}
@ -756,9 +760,10 @@ class DataMapperAbstract implements DataMapperInterface
if (!($isPublic = $property->isPublic())) {
$property->setAccessible(true);
}
$values = $property->getValue($obj);
} else {
$values = $obj->$propertyName;
}
/** @var self $mapper */
$mapper = static::$hasMany[$propertyName]['mapper'];
@ -769,22 +774,19 @@ class DataMapperAbstract implements DataMapperInterface
$relReflectionClass = new \ReflectionClass($values);
$relProperty = $relReflectionClass->getProperty($internalName);
if (!($isPublicRel = $relProperty->isPublic())) {
if (!$relProperty->isPublic()) {
$relProperty->setAccessible(true);
}
$relProperty->setValue($values, $objId);
if (!$isPublicRel) {
$relProperty->setAccessible(false);
} else {
$values->$internalName = $objId;
}
$mapper::create($values);
if (!$isPublic) {
$property->setAccessible(false);
}
$mapper::create($values);
continue;
} elseif (!\is_array($values)) {
if (!$isPublic) {
@ -832,9 +834,17 @@ class DataMapperAbstract implements DataMapperInterface
if (isset($mapper::$belongsTo[$internalName])
|| isset($mapper::$ownsOne[$internalName])
) {
if (!$isPublic) {
$relProperty->setValue($value, self::createNullModel($objId));
} else {
$value->$internalName = self::createNullModel($objId);
}
} else {
if (!$isPublic) {
$relProperty->setValue($value, $objId);
} else {
$value->$internalName = $objId;
}
}
if (!$isPublic) {
@ -1125,19 +1135,17 @@ class DataMapperAbstract implements DataMapperInterface
if (!($isPublic = $property->isPublic())) {
$property->setAccessible(true);
}
$values = $property->getValue($obj);
$property->setAccessible(false);
} else {
$values = $obj->$propertyName;
}
if (!\is_array($values)) {
// conditionals
continue;
}
if (!$isPublic) {
$property->setAccessible(false);
}
/** @var self $mapper */
$mapper = static::$hasMany[$propertyName]['mapper'];
$relReflectionClass = !empty($values) ? new \ReflectionClass(\reset($values)) : null;
@ -1171,12 +1179,10 @@ class DataMapperAbstract implements DataMapperInterface
if (!$isPublic) {
$relProperty->setAccessible(true);
}
$relProperty->setValue($value, $objId);
if (!$isPublic) {
$relProperty->setAccessible(false);
} else {
$value->$mapper::$columns[static::$hasMany[$propertyName]['self']]['internal'] = $objId;
}
}
@ -1446,10 +1452,14 @@ class DataMapperAbstract implements DataMapperInterface
if (!($isPublic = $property->isPublic())) {
$property->setAccessible(true);
$tValue = $property->getValue($obj);
$property->setAccessible(false);
} else {
$tValue = $obj->$propertyName;
}
if (isset(static::$ownsOne[$propertyName])) {
$id = self::updateOwnsOne($propertyName, $property->getValue($obj), $depth);
$id = self::updateOwnsOne($propertyName, $tValue, $depth);
$value = self::parseValue($column['type'], $id);
/**
@ -1460,7 +1470,7 @@ class DataMapperAbstract implements DataMapperInterface
*/
$query->set([static::$table . '.' . $column['name'] => $value]);
} elseif (isset(static::$belongsTo[$propertyName])) {
$id = self::updateBelongsTo($propertyName, $property->getValue($obj), $depth);
$id = self::updateBelongsTo($propertyName, $tValue, $depth);
$value = self::parseValue($column['type'], $id);
/**
@ -1471,7 +1481,6 @@ class DataMapperAbstract implements DataMapperInterface
*/
$query->set([static::$table . '.' . $column['name'] => $value]);
} elseif ($column['name'] !== static::$primaryField) {
$tValue = $property->getValue($obj);
if (\stripos($column['internal'], '/') !== false) {
$path = \substr($column['internal'], \stripos($column['internal'], '/') + 1);
$tValue = ArrayUtils::getArray($path, $tValue, '/');
@ -1481,10 +1490,6 @@ class DataMapperAbstract implements DataMapperInterface
$query->set([static::$table . '.' . $column['name'] => $value]);
}
if (!$isPublic) {
$property->setAccessible(false);
}
}
self::$db->con->prepare($query->toSql())->execute();
@ -1668,19 +1673,17 @@ class DataMapperAbstract implements DataMapperInterface
if (!($isPublic = $property->isPublic())) {
$property->setAccessible(true);
}
$values = $property->getValue($obj);
$property->setAccessible(false);
} else {
$values = $obj->$propertyName;
}
if (!\is_array($values)) {
// conditionals
continue;
}
if (!$isPublic) {
$property->setAccessible(false);
}
/** @var self $mapper */
$mapper = static::$hasMany[$propertyName]['mapper'];
$objsIds = [];
@ -1807,11 +1810,18 @@ class DataMapperAbstract implements DataMapperInterface
* The exception is of course the belongsTo relation.
*/
foreach (static::$columns as $key => $column) {
if (self::$relations === RelationType::ALL && isset(static::$ownsOne[$propertyName]) && $column['internal'] === $propertyName) {
self::deleteOwnsOne($propertyName, $property->getValue($obj));
$value = $isPublic ? $obj->$propertyName : $property->getValue($obj);
if (self::$relations === RelationType::ALL
&& isset(static::$ownsOne[$propertyName])
&& $column['internal'] === $propertyName
) {
self::deleteOwnsOne($propertyName, $value);
break;
} elseif (self::$relations === RelationType::ALL && isset(static::$belongsTo[$propertyName]) && $column['internal'] === $propertyName) {
self::deleteBelongsTo($propertyName, $property->getValue($obj));
} elseif (self::$relations === RelationType::ALL
&& isset(static::$belongsTo[$propertyName])
&& $column['internal'] === $propertyName
) {
self::deleteBelongsTo($propertyName, $value);
break;
}
}
@ -1965,18 +1975,21 @@ class DataMapperAbstract implements DataMapperInterface
$mapper = static::$hasMany[$member]['mapper'];
$refProp = $refClass->getProperty($member);
if (!($accessible = $refProp->isPublic())) {
$refProp->setAccessible(true);
}
$objects = !isset(static::$hasMany[$member]['by'])
? $mapper::get($values, RelationType::ALL, $depth)
: $mapper::get($values, RelationType::ALL, $depth, static::$hasMany[$member]['by']);
$refProp->setValue($obj, !\is_array($objects) && !isset(static::$hasMany[$member]['conditional']) ? [$mapper::getObjectId($objects) => $objects] : $objects);
if (!$accessible) {
if (!($isPublic = $refProp->isPublic())) {
$refProp->setAccessible(true);
$refProp->setValue($obj, !\is_array($objects) && !isset(static::$hasMany[$member]['conditional'])
? [$mapper::getObjectId($objects) => $objects]
: $objects
);
$refProp->setAccessible(false);
} else {
$obj->$member = !\is_array($objects) && !isset(static::$hasMany[$member]['conditional'])
? [$mapper::getObjectId($objects) => $objects]
: $objects;
}
}
}
@ -2205,17 +2218,17 @@ class DataMapperAbstract implements DataMapperInterface
$path = \explode('/', $def['internal']);
$refProp = $refClass->getProperty($path[0]);
if (!($accessible = $refProp->isPublic())) {
if (!($isPublic = $refProp->isPublic())) {
$refProp->setAccessible(true);
}
\array_shift($path);
$arrayPath = \implode('/', $path);
$aValue = $refProp->getValue($obj);
$aValue = $isPublic ? $obj->{$path[0]} : $refProp->getValue($obj);
} else {
$refProp = $refClass->getProperty($def['internal']);
if (!($accessible = $refProp->isPublic())) {
if (!($isPublic = $refProp->isPublic())) {
$refProp->setAccessible(true);
}
}
@ -2223,7 +2236,7 @@ class DataMapperAbstract implements DataMapperInterface
if (isset(static::$ownsOne[$def['internal']])) {
$default = null;
if ($depth - 1 < 1 && $refProp->isInitialized($obj)) {
$default = $refProp->getValue($obj);
$default = $isPublic ? $obj->{$def['internal']} : $refProp->getValue($obj);
}
$value = self::populateOwnsOne($def['internal'], $result, $depth - 1, $default);
@ -2236,7 +2249,7 @@ class DataMapperAbstract implements DataMapperInterface
} elseif (isset(static::$belongsTo[$def['internal']])) {
$default = null;
if ($depth - 1 < 1 && $refProp->isInitialized($obj)) {
$default = $refProp->getValue($obj);
$default = $isPublic ? $obj->{$def['internal']} : $refProp->getValue($obj);
}
$value = self::populateBelongsTo($def['internal'], $result, $depth - 1, $default);
@ -2277,11 +2290,11 @@ class DataMapperAbstract implements DataMapperInterface
$refProp->setValue($obj, \json_decode($value, true));
} elseif ($def['type'] === 'Serializable') {
$member = $refProp->getValue($obj);
$member = $isPublic ? $obj->{$def['internal']} : $refProp->getValue($obj);
$member->unserialize($value);
}
if (!$accessible) {
if (!$isPublic) {
$refProp->setAccessible(false);
}
}
@ -2304,17 +2317,17 @@ class DataMapperAbstract implements DataMapperInterface
$path = \explode('/', $member);
$refProp = $refClass->getProperty($path[0]);
if (!($accessible = $refProp->isPublic())) {
if (!($isPublic = $refProp->isPublic())) {
$refProp->setAccessible(true);
}
\array_shift($path);
$arrayPath = \implode('/', $path);
$aValue = $refProp->getValue($obj);
$aValue = $isPublic ? $obj->{$path[0]} : $refProp->getValue($obj);
} else {
$refProp = $refClass->getProperty($member);
if (!($accessible = $refProp->isPublic())) {
if (!($isPublic = $refProp->isPublic())) {
$refProp->setAccessible(true);
}
}
@ -2350,11 +2363,11 @@ class DataMapperAbstract implements DataMapperInterface
$refProp->setValue($obj, \json_decode($value, true));
} elseif ($def['mapper']::$columns[$column]['type'] === 'Serializable') {
$member = $refProp->getValue($obj);
$member = $isPublic ? $obj->$member : $refProp->getValue($obj);
$member->unserialize($value);
}
if (!$accessible) {
if (!$isPublic) {
$refProp->setAccessible(false);
}
}
@ -2768,11 +2781,9 @@ class DataMapperAbstract implements DataMapperInterface
{
$result = self::get(null, $relations, $depth);
if (\is_object($result)) {
if (\stripos(\get_class($result), '\Null') !== false) {
if (\is_object($result) && \stripos(\get_class($result), '\Null') !== false) {
return [];
}
}
return !\is_array($result) ? [$result] : $result;
}
@ -2855,11 +2866,9 @@ class DataMapperAbstract implements DataMapperInterface
{
$result = self::get(null, $relations, $depth, null, $query);
if (\is_object($result)) {
if (\stripos(\get_class($result), '\Null') !== false) {
if (\is_object($result) && \stripos(\get_class($result), '\Null') !== false) {
return [];
}
}
return !\is_array($result) ? [$result] : $result;
}
@ -2901,20 +2910,14 @@ class DataMapperAbstract implements DataMapperInterface
*/
public static function fillRelations($obj, int $relations = RelationType::ALL, int $depth = 3) : void
{
if ($depth < 1) {
return;
}
if ($relations === RelationType::NONE) {
return;
}
if (empty(static::$hasMany)) {
if ($depth < 1
|| empty(static::$hasMany)
|| $relations === RelationType::NONE
) {
return;
}
$key = self::getObjectId($obj);
if (empty($key)) {
return;
}
@ -2951,20 +2954,14 @@ class DataMapperAbstract implements DataMapperInterface
*/
public static function fillRelationsArray(array &$obj, int $relations = RelationType::ALL, int $depth = 3) : void
{
if ($depth < 1) {
return;
}
if ($relations === RelationType::NONE) {
return;
}
if (empty(static::$hasMany)) {
if ($depth < 1
|| empty(static::$hasMany)
|| $relations === RelationType::NONE
) {
return;
}
$key = $obj[static::$columns[static::$primaryField]['internal']];
if (empty($key)) {
return;
}

14
Log/FileLogger.php
View File

@ -180,14 +180,7 @@ final class FileLogger implements LoggerInterface
*/
public static function startTimeLog(string $id = '') : bool
{
if (isset(self::$timings[$id])) {
return false;
}
$temp = \explode(' ', \microtime());
$mtime = ((float) $temp[1]) + ((float) $temp[0]);
self::$timings[$id] = ['start' => $mtime, 'end' => 0.0, 'time' => 0.0];
self::$timings[$id] = ['start' => \microtime(true), 'end' => 0.0, 'time' => 0.0];
return true;
}
@ -197,14 +190,13 @@ final class FileLogger implements LoggerInterface
*
* @param string $id the ID by which this time measurement gets identified
*
* @return float The time measurement in ms
* @return float The time measurement in seconds
*
* @since 1.0.0
*/
public static function endTimeLog(string $id = '') : float
{
$temp = \explode(' ', \microtime());
$mtime = ((float) $temp[1]) + ((float) $temp[0]);
$mtime = \microtime(true);
self::$timings[$id]['end'] = $mtime;
self::$timings[$id]['time'] = $mtime - self::$timings[$id]['start'];

5
Message/Http/HttpRequest.php
View File

@ -339,7 +339,10 @@ final class HttpRequest extends RequestAbstract
// @codeCoverageIgnoreStart
$components = \explode(';', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
$locals = \stripos($components[0], ',') !== false ? $locals = \explode(',', $components[0]) : $components;
$locals = \stripos($components[0], ',') !== false
? $locals = \explode(',', $components[0])
: $components;
$firstLocalComponents = \explode('-', $locals[0]);
// @codeCoverageIgnoreEnd

2
tests/DataStorage/Database/TestModel/ManyToManyDirectModel.php
View File

@ -20,5 +20,5 @@ class ManyToManyDirectModel
public $string = 'ManyToManyDirect';
public $to = 0;
public int $to = 0;
}