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

Compare commits

base: public:10.0
Branches Tags
public:12.x public:11.x public:10.x public:9.x public:8.x public:7.x public:6.x public:5.x public:4.x public:3.x public:2.x public:1.x
public:12.0 public:11.0.1 public:11.0 public:10.1 public:10.0 public:9.1 public:9.0 public:8.0 public:7.1 public:7.0 public:6.0 public:5.1 public:5.0 public:4.1 public:4.0 public:3.1 public:3.0 public:2.0 public:1.0.1 public:1.0
...
compare: public:10.1
Branches Tags
public:12.x public:11.x public:10.x public:9.x public:8.x public:7.x public:6.x public:5.x public:4.x public:3.x public:2.x public:1.x
public:12.0 public:11.0.1 public:11.0 public:10.1 public:10.0 public:9.1 public:9.0 public:8.0 public:7.1 public:7.0 public:6.0 public:5.1 public:5.0 public:4.1 public:4.0 public:3.1 public:3.0 public:2.0 public:1.0.1 public:1.0

1 Commits
10.0 ... 10.1

Author SHA1 Message Date
User
335c4d240c 20250427#1 2025-04-27 01:31:26 +03:00
5 changed files with 26 additions and 11 deletions
Expand all files Collapse all files

2
src/Attribute/ValueObject.php
View File

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

2
src/Attribute/ValueObjectAutoPropertyName.php → src/Attribute/ValueObjectFirstProperty.php
View File

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

14
src/Attribute/ValueObjectPropertyName.php Normal file
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,
) {}
}

1
src/Entity/ValueObjectInterface.php
View File

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

18
src/Repository/AbstractRepository.php
View File

@@ -10,7 +10,8 @@ use Rmphp\Storage\Attribute\Property;
use Rmphp\Storage\Attribute\PropertyNoReturn; use Rmphp\Storage\Attribute\PropertyNoReturn;
use Rmphp\Storage\Attribute\PropertyNoReturnIfNull; use Rmphp\Storage\Attribute\PropertyNoReturnIfNull;
use Rmphp\Storage\Attribute\ValueObject; 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\Component\AbstractDataObject;
use Rmphp\Storage\Exception\RepositoryException; 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::$attributeObjects[$valueObjectClass] = !empty(self::$classes[$valueObjectClass]->getAttributes(ValueObject::class))
? self::$classes[$valueObjectClass]->getAttributes(ValueObject::class)[0]->newInstance() ? self::$classes[$valueObjectClass]->getAttributes(ValueObject::class)[0]->newInstance()
: new ValueObject(); : 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]; $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(!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)); $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))){ if(self::$classes[$valueObjectClass]->getProperties()[0]->isInitialized($property->getValue($object))){
$fieldValue[$property->getName()] = self::$classes[$valueObjectClass]->getProperties()[0]->getValue($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')){ elseif(self::$classes[$valueObjectClass]->hasMethod('getValue')){
$fieldValue[$property->getName()] = $property->getValue($object)->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))){ elseif(is_bool($property->getValue($object))){
$fieldValue[$property->getName()] = (int)$property->getValue($object); $fieldValue[$property->getName()] = (int)$property->getValue($object);