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

Remove whitespace

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-05-21 22:31:14 +02:00
parent e36f56da30
commit 37add470eb
105 changed files with 420 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
DataStorage/Database/DataMapperAbstract.php
View File

@ -609,7 +609,7 @@ class DataMapperAbstract implements DataMapperInterface
continue; continue;
} }
if (!isset($relReflectionClass)) { if ($relReflectionClass === null) {
$relReflectionClass = new \ReflectionClass($value); $relReflectionClass = new \ReflectionClass($value);
} }
@ -877,12 +877,19 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
private static function parseValue(string $type, $value = null) private static function parseValue(string $type, $value = null)
{ {
// todo: checking for string === string and is_* is slow. maybe only check type or only string
if ($value === null) { if ($value === null) {
return null; return null;
} elseif ($type === 'DateTime' || $value instanceof \DateTime) { } elseif ($type === 'int') {
return (int) $value;
} elseif ($type === 'string') {
return (string) $value;
} elseif ($type === 'float') {
return (float) $value;
} elseif ($type === 'bool') {
return (bool) $value;
} elseif ($type === 'DateTime') {
return $value->format('Y-m-d H:i:s'); return $value->format('Y-m-d H:i:s');
} elseif ($type === 'Json' || $type === 'jsonSerializable' || is_array($value)) { } elseif ($type === 'Json' || $type === 'jsonSerializable') {
return json_encode($value); return json_encode($value);
} elseif ($type === 'Serializable') { } elseif ($type === 'Serializable') {
return $value->serialize(); return $value->serialize();
@ -890,14 +897,6 @@ class DataMapperAbstract implements DataMapperInterface
return json_encode($value->jsonSerialize()); return json_encode($value->jsonSerialize());
} elseif (is_object($value) && method_exists($value, 'getId')) { } elseif (is_object($value) && method_exists($value, 'getId')) {
return $value->getId(); return $value->getId();
} elseif ($type === 'int' || is_int($value)) {
return (int) $value;
} elseif ($type === 'string' || is_string($value)) {
return (string) $value;
} elseif ($type === 'float' || is_float($value)) {
return (float) $value;
} elseif ($type === 'bool' || is_bool($value)) {
return (bool) $value;
} }
return $value; return $value;
@ -950,7 +949,7 @@ class DataMapperAbstract implements DataMapperInterface
continue; continue;
} }
if (!isset($relReflectionClass)) { if ($relReflectionClass === null) {
$relReflectionClass = new \ReflectionClass($value); $relReflectionClass = new \ReflectionClass($value);
} }
@ -1148,7 +1147,7 @@ class DataMapperAbstract implements DataMapperInterface
} elseif ($column['name'] !== static::$primaryField) { } elseif ($column['name'] !== static::$primaryField) {
$tValue = $property->getValue($obj); $tValue = $property->getValue($obj);
if (stripos($column['internal'], '/') !== false) { if (stripos($column['internal'], '/') !== false) {
$path = explode('/', $column['internal']); $path = explode('/', $column['internal']);
array_shift($path); array_shift($path);
$path = implode('/', $path); $path = implode('/', $path);
@ -1254,7 +1253,7 @@ class DataMapperAbstract implements DataMapperInterface
continue; continue;
} }
if (!isset($relReflectionClass)) { if ($relReflectionClass === null) {
$relReflectionClass = new \ReflectionClass($value); $relReflectionClass = new \ReflectionClass($value);
} }
@ -1776,19 +1775,26 @@ class DataMapperAbstract implements DataMapperInterface
continue; continue;
} }
$hasPath = false;
if (stripos(static::$columns[$column]['internal'], '/') !== false) { if (stripos(static::$columns[$column]['internal'], '/') !== false) {
$refProp = $refClass->getProperty(explode('/', static::$columns[$column]['internal'])[0]); $hasPath = true;
$path = explode(static::$columns[$column]['internal']); $path = explode('/', static::$columns[$column]['internal']);
$refProp = $refClass->getProperty($path[0]);
if (!($accessible = $refProp->isPublic())) {
$refProp->setAccessible(true);
}
array_shift($path); array_shift($path);
$path = implode('/', $path); $path = implode('/', $path);
$aValue = $refProp->getValue($obj); $aValue = $refProp->getValue($obj);
} else { } else {
$refProp = $refClass->getProperty(static::$columns[$column]['internal']); $refProp = $refClass->getProperty(static::$columns[$column]['internal']);
}
if (!($accessible = $refProp->isPublic())) { if (!($accessible = $refProp->isPublic())) {
$refProp->setAccessible(true); $refProp->setAccessible(true);
}
} }
if (in_array(static::$columns[$column]['type'], ['string', 'int', 'float', 'bool'])) { if (in_array(static::$columns[$column]['type'], ['string', 'int', 'float', 'bool'])) {
@ -1797,20 +1803,20 @@ class DataMapperAbstract implements DataMapperInterface
settype($value, static::$columns[$column]['type']); settype($value, static::$columns[$column]['type']);
} }
if (isset($path)) { if ($hasPath) {
$value = ArrayUtils::setArray($path, $aValue, $value, '/', true); $value = ArrayUtils::setArray($path, $aValue, $value, '/', true);
} }
$refProp->setValue($obj, $value); $refProp->setValue($obj, $value);
} elseif (static::$columns[$column]['type'] === 'DateTime') { } elseif (static::$columns[$column]['type'] === 'DateTime') {
$value = new \DateTime($value ?? ''); $value = new \DateTime($value ?? '');
if (stripos(static::$columns[$column]['internal'], '/') !== false) { if ($hasPath) {
$value = ArrayUtils::setArray($path, $aValue, $value, '/', true); $value = ArrayUtils::setArray($path, $aValue, $value, '/', true);
} }
$refProp->setValue($obj, $value); $refProp->setValue($obj, $value);
} elseif (static::$columns[$column]['type'] === 'Json') { } elseif (static::$columns[$column]['type'] === 'Json') {
if (stripos(static::$columns[$column]['internal'], '/') !== false) { if ($hasPath) {
$value = ArrayUtils::setArray($path, $aValue, $value, '/', true); $value = ArrayUtils::setArray($path, $aValue, $value, '/', true);
} }
@ -1837,8 +1843,6 @@ class DataMapperAbstract implements DataMapperInterface
* *
* @return array * @return array
* *
* @throws \UnexpectedValueException
*
* @since 1.0.0 * @since 1.0.0
*/ */
public static function populateAbstractArray(array $result) : array public static function populateAbstractArray(array $result) : array
@ -1890,7 +1894,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (!isset(self::$parentMapper)) { if (!isset(self::$parentMapper)) {
self::setUpParentMapper(); self::$parentMapper = static::class;
} }
self::extend(__CLASS__); self::extend(__CLASS__);
@ -1972,7 +1976,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (!isset(self::$parentMapper)) { if (!isset(self::$parentMapper)) {
self::setUpParentMapper(); self::$parentMapper = static::class;
} }
self::extend(__CLASS__); self::extend(__CLASS__);
@ -2017,7 +2021,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (!isset(self::$parentMapper)) { if (!isset(self::$parentMapper)) {
self::setUpParentMapper(); self::$parentMapper = static::class;
} }
self::extend(__CLASS__); self::extend(__CLASS__);
@ -2063,7 +2067,7 @@ class DataMapperAbstract implements DataMapperInterface
public static function getForArray($refKey, string $ref, int $relations = RelationType::ALL, $fill = null) public static function getForArray($refKey, string $ref, int $relations = RelationType::ALL, $fill = null)
{ {
if (!isset(self::$parentMapper)) { if (!isset(self::$parentMapper)) {
self::setUpParentMapper(); self::$parentMapper = static::class;
} }
self::extend(__CLASS__); self::extend(__CLASS__);
@ -2104,7 +2108,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (!isset(self::$parentMapper)) { if (!isset(self::$parentMapper)) {
self::setUpParentMapper(); self::$parentMapper = static::class;
} }
$obj = self::populateIterable(self::getAllRaw($lang)); $obj = self::populateIterable(self::getAllRaw($lang));
@ -2132,7 +2136,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (!isset(self::$parentMapper)) { if (!isset(self::$parentMapper)) {
self::setUpParentMapper(); self::$parentMapper = static::class;
} }
$obj = self::populateIterableArray(self::getAllRaw($lang)); $obj = self::populateIterableArray(self::getAllRaw($lang));
@ -2660,18 +2664,6 @@ class DataMapperAbstract implements DataMapperInterface
} }
} }
/**
* Define the highest mapper of this request
*
* @return void
*
* @since 1.0.0
*/
private static function setUpParentMapper() : void
{
self::$parentMapper = static::class;
}
/** /**
* Check if model exists in database * Check if model exists in database
* *