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

20250330#2

Browse Source
This commit is contained in:
User
2025-03-30 15:13:47 +03:00
parent fd996d40c8
commit 1ce2a09e01
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Attribute/EntityWithoutEmpty.php Normal file
View File

@@ -0,0 +1,8 @@
<?php
namespace Rmphp\Storage\Attribute;
use Attribute;
#[Attribute(Attribute::TARGET_CLASS)]
class EntityWithoutEmpty {}

2
src/Attribute/GetPropertyEmptyIfNull.php
View File

@@ -4,5 +4,5 @@ namespace Rmphp\Storage\Attribute;
use Attribute;
#[Attribute(Attribute::TARGET_PROPERTY)]
#[Attribute(Attribute::TARGET_PROPERTY|Attribute::TARGET_CLASS)]
class GetPropertyEmptyIfNull {}

1
src/Attribute/ValueObject.php
View File

@@ -8,6 +8,7 @@ use Attribute;
class ValueObject {
public function __construct(
public bool $autoPropertyName = true,
public ?string $propertyName = null,
) {}

2
src/Component/AbstractDataObject.php
View File

@@ -6,6 +6,7 @@ use Exception;
use ReflectionClass;
use ReflectionException;
use Rmphp\Storage\Attribute\Entity;
use Rmphp\Storage\Attribute\EntityWithoutEmpty;
abstract class AbstractDataObject {
@@ -32,6 +33,7 @@ abstract class AbstractDataObject {
}
/** @var Entity $entityAttributes */
$entityAttributes = self::$attributeObjects[$class->getName()][0];
if(!empty($class->getAttributes(EntityWithoutEmpty::class))) $entityAttributes->withoutEmpty = true;
$value = [];
foreach($class->getProperties() as $property){

17
src/Repository/AbstractRepository.php
View File

@@ -2,9 +2,11 @@
namespace Rmphp\Storage\Repository;
use App\Domain\ValueObject\Price;
use Exception;
use ReflectionClass;
use Rmphp\Storage\Attribute\Entity;
use Rmphp\Storage\Attribute\EntityWithoutEmpty;
use Rmphp\Storage\Attribute\GetProperty;
use Rmphp\Storage\Attribute\GetPropertyEmpty;
use Rmphp\Storage\Attribute\GetPropertyEmptyIfNull;
@@ -29,6 +31,8 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
}
/** @var Entity $entityAttributes */
$entityAttributes = self::$attributeObjects[$class][0];
if(!empty(self::$classes[$class]->getAttributes(EntityWithoutEmpty::class))) $entityAttributes->withoutEmpty = true;
if(!empty(self::$classes[$class]->getAttributes(GetPropertyEmptyIfNull::class))) $entityAttributes->withoutEmpty = true;
$fieldValue = [];
foreach(self::$classes[$class]->getProperties() as $property){
@@ -40,6 +44,7 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
}
/** @var GetProperty $getPropertyAttributes */
$getPropertyAttributes = self::$attributeObjects[$class][$property->getName()];
if(!empty($property->getAttributes(GetPropertyEmptyIfNull::class))) $getPropertyAttributes->emptyIfNull = true;
if(!empty($property->getAttributes(GetPropertyEmpty::class)) || !empty($getPropertyAttributes->empty)) continue;
@@ -63,8 +68,13 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
$valueObjectAttributes = self::$attributeObjects[$valueObjectClass];
if(!empty($valueObjectAttributes->propertyName) && self::$classes[$valueObjectClass]->hasProperty($valueObjectAttributes->propertyName)){
if(self::$classes[$valueObjectClass]->getProperty($valueObjectAttributes->propertyName)->isInitialized($property->getValue($object)))
if(self::$classes[$valueObjectClass]->getProperty($valueObjectAttributes->propertyName)->isInitialized($property->getValue($object))){
$fieldValue[$property->getName()] = self::$classes[$valueObjectClass]->getProperty($valueObjectAttributes->propertyName)->getValue($property->getValue($object));
}
} elseif(!empty($valueObjectAttributes->autoPropertyName) && count(self::$classes[$valueObjectClass]->getProperties()) === 1){
if(self::$classes[$valueObjectClass]->getProperties()[0]->isInitialized($property->getValue($object))){
$fieldValue[$property->getName()] = self::$classes[$valueObjectClass]->getProperties()[0]->getValue($property->getValue($object));
}
} else{
$fieldValue[$property->getName()] = $property->getValue($object)->getValue();
}
@@ -76,10 +86,7 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
$fieldValue[$property->getName()] = $property->getValue($object);
}
if(
!isset($fieldValue[$property->getName()])
&& (!empty($property->getAttributes(GetPropertyEmptyIfNull::class)) || !empty($getPropertyAttributes->emptyIfNull) || !empty($entityAttributes->withoutNull))
) continue;
if(!isset($fieldValue[$property->getName()]) && (!empty($getPropertyAttributes->emptyIfNull) || !empty($entityAttributes->withoutEmpty))) continue;
if(array_key_exists($property->getName(), $fieldValue) && false !== $fieldValue[$property->getName()]) {
$columnName = !empty($getPropertyAttributes->keyName) ? $getPropertyAttributes->keyName : strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()));