public/rmphp-storage
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20250218#4

Browse Source
This commit is contained in:
User
2025-02-18 02:32:22 +03:00
parent 73b7cb3a5f
commit 612132f938
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/AbstractRepository.php
View File

@@ -36,31 +36,32 @@ abstract class AbstractRepository implements RepositoryInterface {
} }
/** /** @inheritDoc */
* @param object $object
* @param callable|null $method
* @return array
* @throws RepositoryException
*/
public function getProperties(object $object, callable $method = null) : array { public function getProperties(object $object, callable $method = null) : array {
try{ try{
$class = get_class($object); $class = get_class($object);
if(!isset(static::$classes[$class])) static::$classes[$class] = new ReflectionClass($class); if(!isset(static::$classes[$class])) static::$classes[$class] = new ReflectionClass($class);
/** @var ReflectionProperty $property */ /** @var ReflectionProperty $property */
foreach(static::$classes[$class]->getProperties() as $property){ foreach(static::$classes[$class]->getProperties() as $property){
if(!$property->isInitialized($object) || is_array($property->getValue($object))) continue; if(!$property->isInitialized($object) || is_array($property->getValue($object))) continue;
if(static::$classes[$class]->hasMethod('get'.ucfirst($property->getName()))){ if(static::$classes[$class]->hasMethod('get'.ucfirst($property->getName()))){
$fieldValue[$property->getName()] = $object->{'get'.ucfirst($property->getName())}($property->getValue($object)); $fieldValue[$property->getName()] = $object->{'get'.ucfirst($property->getName())}($property->getValue($object));
} }
elseif($property->hasType() && class_exists($property->getType()->getName()) && $property->getValue($object) instanceof ValueObjectInterface){ elseif($property->hasType() && class_exists($property->getType()->getName()) && $property->getValue($object) instanceof ValueObjectInterface){
$fieldValue[$property->getName()] = $property->getValue($object)->get(); $fieldValue[$property->getName()] = $property->getValue($object)->getValue();
} }
elseif(is_bool($property->getValue($object))){ elseif(is_bool($property->getValue($object))){
$fieldValue[$property->getName()] = (int) $property->getValue($object); $fieldValue[$property->getName()] = (int) $property->getValue($object);
} }
else $fieldValue[$property->getName()] = $property->getValue($object); else {
$fieldNameSnakeCase = strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName())); $fieldValue[$property->getName()] = $property->getValue($object);
if(false !== $fieldValue[$property->getName()]) $out[$fieldNameSnakeCase] = $fieldValue[$property->getName()]; }
if(false !== $fieldValue[$property->getName()]) {
$out[strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()))] = $fieldValue[$property->getName()];
}
} }
return (isset($method)) ? array_map($method, $out ?? []) : $out ?? []; return (isset($method)) ? array_map($method, $out ?? []) : $out ?? [];
} }
@@ -82,16 +83,26 @@ abstract class AbstractRepository implements RepositoryInterface {
try { try {
foreach($class->getProperties() as $property){ foreach($class->getProperties() as $property){
if($update && !array_key_exists($property->getName(), $data) && !array_key_exists(strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName())), $data)) continue; if($update && !array_key_exists($property->getName(), $data) && !array_key_exists(strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName())), $data)) continue;
// data[propertyName] ?? data[property_name] ?? null // data[propertyName] ?? data[property_name] ?? null
$value = $data[$property->getName()] ?? $data[strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()))] ?? null; $value = $data[$property->getName()] ?? $data[strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()))] ?? null;
// если есть внутренний метод (приоритетная обработка) // если есть внутренний метод (приоритетная обработка)
if($class->hasMethod('set'.ucfirst($property->getName()))) $object->{'set'.ucfirst($property->getName())}($value); if($class->hasMethod('set'.ucfirst($property->getName()))) {
$object->{'set'.ucfirst($property->getName())}($value);
}
// Если тип свойства класс (valueObject) // Если тип свойства класс (valueObject)
elseif($property->hasType() && class_exists($property->getType()->getName())) $object->{$property->getName()} = (is_object($value)) ? $value : new ($property->getType()->getName())($value); elseif($property->hasType() && class_exists($property->getType()->getName())) {
$object->{$property->getName()} = (is_object($value)) ? $value : new ($property->getType()->getName())($value);
}
// если значения не пустое // если значения не пустое
elseif(isset($value)) $object->{$property->getName()} = $value; elseif(isset($value)) {
$object->{$property->getName()} = $value;
}
// если значения может быть пустое // если значения может быть пустое
elseif($property->getType()->allowsNull()) $object->{$property->getName()} = null; elseif($property->getType()->allowsNull()) {
$object->{$property->getName()} = null;
}
} }
return $object; return $object;
} }

2
src/Entity/AbstractEntity.php
View File

@@ -8,7 +8,7 @@ abstract class AbstractEntity implements EntityInterface {
* @return mixed * @return mixed
*/ */
public function getId(): mixed { public function getId(): mixed {
return (isset($this->id)) ? (($this->id instanceof ValueObjectInterface) ? $this->id->get() : $this->id) : null; return (isset($this->id)) ? (($this->id instanceof ValueObjectInterface) ? $this->id->getValue() : $this->id) : null;
} }
/** /**

2
src/Entity/ValueObjectInterface.php
View File

@@ -4,7 +4,7 @@ namespace Rmphp\Storage\Entity;
interface ValueObjectInterface { interface ValueObjectInterface {
public function get(); public function getValue();
public function __toString(): string; public function __toString(): string;
} }