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

20250427#1

Browse Source
This commit is contained in:
User committed 2025-04-27 01:31:26 +03:00
1 parent 91af1ea14f
commit 335c4d240c
5 files changed
+26 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Attribute/ValueObject.php
+1 -1
View File
@@ -8,8 +8,8 @@ use Attribute;
class ValueObject {
public function __construct(
public bool $autoPropertyName = false,
public ?string $propertyName = null,
public bool $firstProperty = false
) {}
}
src/Attribute/ValueObjectAutoPropertyName.php → src/Attribute/ValueObjectFirstProperty.php
+1 -1
View File
@@ -5,4 +5,4 @@ namespace Rmphp\Storage\Attribute;
use Attribute;
#[Attribute(Attribute::TARGET_CLASS)]
class ValueObjectAutoPropertyName {}
class ValueObjectFirstProperty {}
src/Attribute/ValueObjectPropertyName.php
+14
View File
@@ -0,0 +1,14 @@
<?php
namespace Rmphp\Storage\Attribute;
use Attribute;
#[Attribute(Attribute::TARGET_CLASS)]
class ValueObjectPropertyName {
public function __construct(
public ?string $name = null,
) {}
}
src/Entity/ValueObjectInterface.php
-1
View File
@@ -4,7 +4,6 @@ namespace Rmphp\Storage\Entity;
interface ValueObjectInterface {
public function getValue();
public function __toString(): string;
}
src/Repository/AbstractRepository.php
+10 -8
View File
@@ -10,7 +10,8 @@ use Rmphp\Storage\Attribute\Property;
use Rmphp\Storage\Attribute\PropertyNoReturn;
use Rmphp\Storage\Attribute\PropertyNoReturnIfNull;
use Rmphp\Storage\Attribute\ValueObject;
use Rmphp\Storage\Attribute\ValueObjectAutoPropertyName;
use Rmphp\Storage\Attribute\ValueObjectFirstProperty;
use Rmphp\Storage\Attribute\ValueObjectPropertyName;
use Rmphp\Storage\Component\AbstractDataObject;
use Rmphp\Storage\Exception\RepositoryException;
@@ -60,16 +61,22 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
self::$attributeObjects[$valueObjectClass] = !empty(self::$classes[$valueObjectClass]->getAttributes(ValueObject::class))
? self::$classes[$valueObjectClass]->getAttributes(ValueObject::class)[0]->newInstance()
: new ValueObject();
if(!empty(self::$classes[$valueObjectClass]->getAttributes(ValueObjectFirstProperty::class))) {
self::$attributeObjects[$valueObjectClass]->firstProperty = true;
}
if(!empty(self::$classes[$valueObjectClass]->getAttributes(ValueObjectPropertyName::class))) {
$propertyName = self::$classes[$valueObjectClass]->getAttributes(ValueObjectPropertyName::class)[0]->newInstance();
if(isset($propertyName->name)) self::$attributeObjects[$valueObjectClass]->propertyName = $propertyName->name;
}
}
$valueObjectAttributes = self::$attributeObjects[$valueObjectClass];
if(!empty(self::$classes[$valueObjectClass]->getAttributes(ValueObjectAutoPropertyName::class))) $valueObjectAttributes->autoPropertyName = true;
if(!empty($valueObjectAttributes->propertyName) && self::$classes[$valueObjectClass]->hasProperty($valueObjectAttributes->propertyName)){
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){
elseif(!empty($valueObjectAttributes->firstProperty) && count(self::$classes[$valueObjectClass]->getProperties()) > 0){
if(self::$classes[$valueObjectClass]->getProperties()[0]->isInitialized($property->getValue($object))){
$fieldValue[$property->getName()] = self::$classes[$valueObjectClass]->getProperties()[0]->getValue($property->getValue($object));
}
@@ -77,11 +84,6 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
elseif(self::$classes[$valueObjectClass]->hasMethod('getValue')){
$fieldValue[$property->getName()] = $property->getValue($object)->getValue();
}
elseif(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));
}
}
}
elseif(is_bool($property->getValue($object))){
$fieldValue[$property->getName()] = (int)$property->getValue($object);