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

add date time immutable

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-09-06 21:12:33 +02:00
parent ace6e49380
commit 6035870c1f
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DataStorage/Database/DataMapperAbstract.php
View File

@ -1063,7 +1063,7 @@ class DataMapperAbstract implements DataMapperInterface
return (float) $value; return (float) $value;
} elseif ($type === 'bool') { } elseif ($type === 'bool') {
return (bool) $value; return (bool) $value;
} elseif ($type === 'DateTime') { } elseif ($type === 'DateTime' || $type === 'DateTimeImmutable') {
return $value === null ? null : $value->format('Y-m-d H:i:s'); return $value === null ? null : $value->format('Y-m-d H:i:s');
} elseif ($type === 'Json' || $type === 'jsonSerializable') { } elseif ($type === 'Json' || $type === 'jsonSerializable') {
return (string) \json_encode($value); return (string) \json_encode($value);
@ -2250,6 +2250,13 @@ class DataMapperAbstract implements DataMapperInterface
$value = ArrayUtils::setArray($arrayPath, $aValue, $value, '/', true); $value = ArrayUtils::setArray($arrayPath, $aValue, $value, '/', true);
} }
$refProp->setValue($obj, $value);
} elseif ($def['type'] === 'DateTimeImmutable') {
$value = $value === null ? null : new \DateTimeImmutable($value);
if ($hasPath) {
$value = ArrayUtils::setArray($arrayPath, $aValue, $value, '/', true);
}
$refProp->setValue($obj, $value); $refProp->setValue($obj, $value);
} elseif ($def['type'] === 'Json') { } elseif ($def['type'] === 'Json') {
if ($hasPath) { if ($hasPath) {
@ -2313,6 +2320,13 @@ class DataMapperAbstract implements DataMapperInterface
$value = ArrayUtils::setArray($arrayPath, $aValue, $value, '/', true); $value = ArrayUtils::setArray($arrayPath, $aValue, $value, '/', true);
} }
$refProp->setValue($obj, $value);
} elseif ($def['mapper']::$columns[$column]['type'] === 'DateTimeImmutable') {
$value = $value === null ? null : new \DateTimeImmutable($value);
if ($hasPath) {
$value = ArrayUtils::setArray($arrayPath, $aValue, $value, '/', true);
}
$refProp->setValue($obj, $value); $refProp->setValue($obj, $value);
} elseif ($def['mapper']::$columns[$column]['type'] === 'Json') { } elseif ($def['mapper']::$columns[$column]['type'] === 'Json') {
if ($hasPath) { if ($hasPath) {
@ -2375,6 +2389,8 @@ class DataMapperAbstract implements DataMapperInterface
\settype($value, static::$columns[$column]['type']); \settype($value, static::$columns[$column]['type']);
} elseif (static::$columns[$column]['type'] === 'DateTime') { } elseif (static::$columns[$column]['type'] === 'DateTime') {
$value = $value === null ? null : new \DateTime($value); $value = $value === null ? null : new \DateTime($value);
} elseif (static::$columns[$column]['type'] === 'DateTimeImmutable') {
$value = $value === null ? null : new \DateTimeImmutable($value);
} elseif (static::$columns[$column]['type'] === 'Json') { } elseif (static::$columns[$column]['type'] === 'Json') {
$value = \json_decode($value, true); $value = \json_decode($value, true);
} }
@ -2397,6 +2413,8 @@ class DataMapperAbstract implements DataMapperInterface
\settype($value, $def['mapper']::$columns[$column]['type']); \settype($value, $def['mapper']::$columns[$column]['type']);
} elseif ($def['mapper']::$columns[$column]['type'] === 'DateTime') { } elseif ($def['mapper']::$columns[$column]['type'] === 'DateTime') {
$value = $value === null ? null : new \DateTime($value); $value = $value === null ? null : new \DateTime($value);
} elseif ($def['mapper']::$columns[$column]['type'] === 'DateTimeImmutable') {
$value = $value === null ? null : new \DateTimeImmutable($value);
} elseif ($def['mapper']::$columns[$column]['type'] === 'Json') { } elseif ($def['mapper']::$columns[$column]['type'] === 'Json') {
$value = \json_decode($value, true); $value = \json_decode($value, true);
} }

2
Utils/StringUtils.php
View File

@ -211,7 +211,7 @@ final class StringUtils
return $element ? '1' : '0'; return $element ? '1' : '0';
} elseif ($element === null) { } elseif ($element === null) {
return null; return null;
} elseif ($element instanceof \DateTime) { } elseif ($element instanceof \DateTimeInterface) {
return $element->format('Y-m-d H:i:s'); return $element->format('Y-m-d H:i:s');
} elseif ($element instanceof RenderableInterface) { } elseif ($element instanceof RenderableInterface) {
return $element->render(); return $element->render();