20250419#2

README.md

@@ -10,12 +10,12 @@ Stable version
 composer require rmphp/storage
 ```
 ```bash
-composer require rmphp/storage:"^6.0"
+composer require rmphp/storage:"^10.0"
 ```
 
 
 Dev version contains the latest changes
 
 ```bash
-composer require rmphp/storage:"6.x-dev"
+composer require rmphp/storage:"10.x-dev"
 ```

src/AbstractMysqlRepository.php

@@ -60,7 +60,7 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 		$in = $this->getProperties($object, function ($value){
 			return (is_string($value)) ? $this->mysql->escapeStr($value) : $value;
 		});
-		if($this->getDebug()) {$this->debug($object, $in, $table, $this->getRepositoryStack()); exit;}
+		if($this->isDebug()) {$this->debug($object, $in, $table, ...$this->getDebugExtraData()); exit;}
 		try {
 			if (!empty($object->getId()) && !empty($this->mysql->findById($table, $object->getId()))) {
 				$this->mysql->updateById($table, $in, $object->getId());
@@ -79,7 +79,7 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 		$in = array_map(function ($value){
 			return (is_string($value)) ? $this->mysql->escapeStr($value) : $value;
 		}, $data);
-		if($this->getDebug()) {$this->debug($data, $in, $table, $this->getRepositoryStack()); exit;}
+		if($this->isDebug()) {$this->debug($data, $in, $table, ...$this->getDebugExtraData()); exit;}
 		try {
 			if (!empty($data[$primaryKey]) && !empty($this->mysql->findById($table, $data[$primaryKey], $primaryKey))) {
 				$this->mysql->updateById($table, $in, $data[$primaryKey]);
@@ -181,12 +181,19 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 	/**
 	 * @return bool
 	 */
-	private function getDebug(): bool {
+	private function isDebug(): bool {
 		if(!empty($this->debug)) return $this->debug;
 		if(!empty(static::DEBUG)) return static::DEBUG;
 		return false;
 	}
 
+	/**
+	 * @return array
+	 */
+	protected function getDebugExtraData() : array {
+		return [$this->getRepositoryStack(), $this->getClassesCache(), $this->getAttributesObjectsCache()];
+	}
+
 	/**
 	 * @param ...$arg
 	 * @return void

src/Attribute/Data.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Rmphp\Storage\Attribute;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+class Data {
+
+	public function __construct(
+		public bool $ignorEmpty = false,
+	) {}
+
+}

src/Attribute/DataIgnorEmpty.php

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

src/Attribute/Entity.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Rmphp\Storage\Attribute;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+class Entity {
+
+	public function __construct(
+		public bool $noReturnIfNull = false,
+	) {}
+
+}

src/Attribute/EntityNoReturnIfNull.php

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

src/Attribute/Property.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rmphp\Storage\Attribute;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_PROPERTY)]
+class Property {
+
+	public function __construct(
+		public ?string $keyName = null,
+		public bool $noReturn = false,
+		public bool $noReturnIfNull = false,
+	) {}
+
+}

src/Attribute/PropertyNoReturn.php

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

src/Attribute/PropertyNoReturnIfNull.php

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

src/Attribute/ValueObject.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rmphp\Storage\Attribute;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+class ValueObject {
+
+	public function __construct(
+		public bool $autoPropertyName = false,
+		public ?string $propertyName = null,
+	) {}
+
+}

src/Attribute/ValueObjectAutoPropertyName.php

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

src/Component/AbstractDataObject.php

@@ -5,25 +5,40 @@ namespace Rmphp\Storage\Component;
 use Exception;
 use ReflectionClass;
 use ReflectionException;
+use Rmphp\Storage\Attribute\Data;
+use Rmphp\Storage\Attribute\DataIgnorEmpty;
 
-class AbstractDataObject {
+abstract class AbstractDataObject {
 
-	private static array $constructorEmptyAvailableClasses = [];
 	private static array $stack  = [];
+	protected static array $constructorEmptyAvailableClasses = [];
+	protected static array $classes = [];
+	protected static array $attributeObjects = [];
 
 	/**
 	 * @param ReflectionClass $class
 	 * @param object $object
 	 * @param array $data
 	 * @param bool $update
+	 * @param bool $withEmpty
 	 * @return mixed
 	 * @throws Exception
 	 */
-	protected static function fillObject(ReflectionClass $class, object $object, array $data, bool $update = false) : mixed {
+	protected static function fillObject(ReflectionClass $class, object $object, array $data, bool $update = false, bool $withEmpty = true) : mixed {
 		try {
+			if(!isset(self::$attributeObjects[$class->getName()][0])){
+				self::$attributeObjects[$class->getName()][0] = !empty($class->getAttributes(Data::class))
+					? $class->getAttributes(Data::class)[0]->newInstance()
+					: new Data();
+			}
+			/** @var Data $dataAttributes */
+			$dataAttributes = self::$attributeObjects[$class->getName()][0];
+			if(!empty($class->getAttributes(DataIgnorEmpty::class))) $dataAttributes->ignorEmpty = true;
+
 			$value = [];
 			foreach($class->getProperties() as $property){
 				$prop[$property->getName()] = ($property->hasType()) ? $property->getType()->getName() : "";
+
 				// значение в массиве по ключю с именем свойства
 				if(array_key_exists($property->getName(), $data)){
 					$value[$property->getName()] = $data[$property->getName()];
@@ -39,38 +54,53 @@ class AbstractDataObject {
 				// если есть внутренний метод (приоритетная обработка)
 				if($class->hasMethod('set'.ucfirst($property->getName()))) {
 					$object->{'set'.ucfirst($property->getName())}($value[$property->getName()] ?? null);
+					$case[$property->getName()] = 'Method set'.ucfirst($property->getName());
 				}
 				// Если тип свойства класс (valueObject)
 				elseif($property->hasType() && class_exists($property->getType()->getName())) {
+					// значение объект
 					if(is_object($value[$property->getName()])){
 						$object->{$property->getName()} = $value[$property->getName()];
+						$case[$property->getName()] = 'VO: Object';
 					}
-					elseif(isset($value[$property->getName()])){
+					// значение не пустое
+					elseif(isset($value[$property->getName()]) && $value[$property->getName()] !== ""){
 						$object->{$property->getName()} = new ($property->getType()->getName())($value[$property->getName()]);
+						$case[$property->getName()] = 'VO: NewInstance';
 					}
 					// Значения нет и VO может быть без параметров
-					elseif(self::isEmptyAvailable($property->getType()->getName())) {
+					elseif(($withEmpty && empty($dataAttributes->ignorEmpty)) && self::isEmptyAvailable($property->getType()->getName())) {
 						$object->{$property->getName()} = new ($property->getType()->getName())();
+						$case[$property->getName()] = 'VO: Without params';
 					}
 				}
 				// Базовые типы при наличии значения
 				elseif(array_key_exists($property->getName(), $value)){
 					if(!$property->hasType()){
 						$object->{$property->getName()} = $value[$property->getName()];
+						$case[$property->getName()] = 'Base: Hasn`t type';
 					}
 					elseif(in_array($property->getType()->getName(), ['float', 'int'])){
 						if(is_numeric($value[$property->getName()])) $object->{$property->getName()} = $value[$property->getName()];
+						$case[$property->getName()] = 'Base: Number';
 					}
 					elseif($property->getType()->getName() == 'bool'){
 						$object->{$property->getName()} = (bool)$value[$property->getName()];
+						$case[$property->getName()] = 'Base: Boolean';
 					}
 					elseif(isset($value[$property->getName()])){
 						$object->{$property->getName()} = $value[$property->getName()];
+						$case[$property->getName()] = 'Base: NotNull';
+					}
+					elseif($property->getType()->allowsNull()){
+						$object->{$property->getName()} = $value[$property->getName()];
+						$case[$property->getName()] = 'Base: Null';
 					}
 				}
 			}
 			self::$stack[$object::class." #".spl_object_id($object)]['properties'] = $prop ?? [];
 			self::$stack[$object::class." #".spl_object_id($object)]['values'] = $value;
+			self::$stack[$object::class." #".spl_object_id($object)]['matchCase'] = $case ?? [];
 			self::$stack[$object::class." #".spl_object_id($object)]['object'] = $object;
 			return $object;
 		}
@@ -94,11 +124,11 @@ class AbstractDataObject {
 		return self::$constructorEmptyAvailableClasses[$class] = true;
 	}
 
-
 	/**
 	 * @return array
 	 */
 	protected function getFillObjectStack() : array {
 		return self::$stack;
 	}
+
 }

src/Entity/AbstractEntity.php

@@ -25,7 +25,7 @@ abstract class AbstractEntity implements EntityInterface {
 	 * @return string
 	 */
 	public function __get(string $name) {
-		return $this->$name ?? "";
+		return $this->$name ?? null;
 	}
 
 	/**

src/Mysql/MysqlStorage.php

@@ -13,26 +13,23 @@ class MysqlStorage implements MysqlStorageInterface {
 	private Mysqli $mysqli;
 
 	/**
-	 * Внутренний конструктор подключения к БД
+	 * @param array $paramsArray
-	 * Mysql constructor.
-	 * @param object $params
 	 * @throws Exception
 	 */
-	public function __construct(
+	public function __construct(array $paramsArray) {
-		private readonly object $params
+		$params = (object) $paramsArray;
-	) {
 		$this->mysqli = new mysqli(
-			$this->params->host,
+			$params->host,
-			$this->params->user,
+			$params->user,
-			$this->params->pass,
+			$params->pass,
-			$this->params->base
+			$params->base
 		);
 		// выводим ошибку при неудачном подключении
 		if ($this->mysqli->connect_errno) {
 			throw new Exception($this->mysqli->connect_errno);
 		}
-		$this->mysqli->set_charset("utf8");
+		$this->mysqli->set_charset($params->chartset ?? "utf8");
-		if(!empty($this->params->logsEnable)) $this->logsEnabled = true;
+		if(!empty($params->logs)) $this->logsEnabled = true;
 	}
 
 	/** @inheritDoc */

src/Repository/AbstractRepository.php

@@ -4,31 +4,84 @@ namespace Rmphp\Storage\Repository;
 
 use Exception;
 use ReflectionClass;
-use ReflectionException;
+use Rmphp\Storage\Attribute\Entity;
+use Rmphp\Storage\Attribute\EntityNoReturnIfNull;
+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\Component\AbstractDataObject;
-use Rmphp\Storage\Entity\ValueObjectInterface;
 use Rmphp\Storage\Exception\RepositoryException;
 
 abstract class AbstractRepository extends AbstractDataObject implements RepositoryInterface {
 
-	private static array $classes = [];
-
 	/** @inheritDoc */
 	public function getProperties(object $object, callable $method = null) : array {
 		try{
 			$class = get_class($object);
 			if(!isset(self::$classes[$class])) self::$classes[$class] = new ReflectionClass($class);
 
+			if(!isset(self::$attributeObjects[$class][0])){
+				self::$attributeObjects[$class][0] = !empty(self::$classes[$class]->getAttributes(Entity::class))
+					? self::$classes[$class]->getAttributes(Entity::class)[0]->newInstance()
+					: new Entity();
+			}
+			/** @var Entity $entityAttributes */
+			$entityAttributes = self::$attributeObjects[$class][0];
+			if(!empty(self::$classes[$class]->getAttributes(EntityNoReturnIfNull::class))) $entityAttributes->noReturnIfNull = true;
+
 			$fieldValue = [];
 			foreach(self::$classes[$class]->getProperties() as $property){
-				if(!$property->isInitialized($object) || is_array($property->getValue($object))) continue;
+
+				if(!isset(self::$attributeObjects[$class][$property->getName()])){
+					self::$attributeObjects[$class][$property->getName()] = !empty($property->getAttributes(Property::class))
+						? $property->getAttributes(Property::class)[0]->newInstance()
+						: new Property();
+				}
+				/** @var Property $propertyAttributes */
+				$propertyAttributes = self::$attributeObjects[$class][$property->getName()];
+				if(!empty($property->getAttributes(PropertyNoReturnIfNull::class))) $propertyAttributes->noReturnIfNull = true;
+
+				if(!empty($property->getAttributes(PropertyNoReturn::class)) || !empty($propertyAttributes->noReturn)) continue;
+
+				if($property->isInitialized($object)) {
+
+					if(is_array($property->getValue($object))) continue;
 
 					if(self::$classes[$class]->hasMethod('get'.ucfirst($property->getName()))){
 						$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())){
-					$value = $property->getValue($object)->getValue();
+						$valueObjectClass = get_class($property->getValue($object));
-					if(isset($value)) $fieldValue[$property->getName()] = $value;
+						if(!isset(self::$classes[$valueObjectClass])) self::$classes[$valueObjectClass] = new ReflectionClass($valueObjectClass);
+
+						if(!isset(self::$attributeObjects[$valueObjectClass])){
+							self::$attributeObjects[$valueObjectClass] = !empty(self::$classes[$valueObjectClass]->getAttributes(ValueObject::class))
+								? self::$classes[$valueObjectClass]->getAttributes(ValueObject::class)[0]->newInstance()
+								: new ValueObject();
+						}
+						$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){
+							if(self::$classes[$valueObjectClass]->getProperties()[0]->isInitialized($property->getValue($object))){
+								$fieldValue[$property->getName()] = self::$classes[$valueObjectClass]->getProperties()[0]->getValue($property->getValue($object));
+							}
+						}
+						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);
@@ -37,23 +90,30 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
 						$fieldValue[$property->getName()] = $property->getValue($object);
 					}
 
+					if(!isset($fieldValue[$property->getName()]) && (!empty($propertyAttributes->noReturnIfNull) || !empty($entityAttributes->noReturnIfNull))) continue;
+
 					if(array_key_exists($property->getName(), $fieldValue) && false !== $fieldValue[$property->getName()]) {
-					$out[strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()))] = $fieldValue[$property->getName()];
+						$columnName = !empty($propertyAttributes->keyName) ? $propertyAttributes->keyName : strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()));
+						$out[$columnName] = $fieldValue[$property->getName()];
+					}
 				}
 			}
 			return (isset($method)) ? array_map($method, $out ?? []) : $out ?? [];
 		}
-		catch (ReflectionException $exception) {
+		catch (\ReflectionException $exception) {
 			throw new RepositoryException($exception->getMessage());
 		}
 	}
 
 
-	/** @inheritDoc */
+	/**
-	public function createFromData(string $class, array|object $data) : object {
+	 * @inheritDoc
+	 * @throws RepositoryException
+	 */
+	public function createFromData(string $class, array|object $data, bool $withEmpty = true) : object {
 		try {
 			if(!isset(self::$classes[$class])) self::$classes[$class] = new ReflectionClass($class);
-			return self::fillObject(self::$classes[$class], new $class, (is_object($data)) ? get_object_vars($data) : $data);
+			return self::fillObject(self::$classes[$class], new $class, (is_object($data)) ? get_object_vars($data) : $data, false, $withEmpty);
 		}
 		catch (Exception $exception) {
 			throw new RepositoryException($exception->getMessage());
@@ -61,12 +121,15 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
 	}
 
 
-	/** @inheritDoc */
+	/**
-	public function updateFromData(object $object, array|object $data) : object {
+	 * @inheritDoc
+	 * @throws RepositoryException
+	 */
+	public function updateFromData(object $object, array|object $data, bool $withEmpty = true) : object {
 		try {
 			$class = get_class($object);
 			if(!isset(self::$classes[$class])) self::$classes[$class] = new ReflectionClass($class);
-			return self::fillObject(self::$classes[$class], clone $object, (is_object($data)) ? get_object_vars($data) : $data, true);
+			return self::fillObject(self::$classes[$class], clone $object, (is_object($data)) ? get_object_vars($data) : $data, true, $withEmpty);
 		}
 		catch (Exception $exception) {
 			throw new RepositoryException($exception->getMessage());
@@ -83,8 +146,22 @@ abstract class AbstractRepository extends AbstractDataObject implements Reposito
 	/**
 	 * @return array
 	 */
-	public function getClassesCash() : array {
+	public function getClassesCache() : array {
 		return self::$classes;
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getAttributesObjectsCache() : array {
+		return self::$attributeObjects;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getConstructorEmptyAvailableClassesCache() : array {
+		return self::$constructorEmptyAvailableClasses;
+	}
+
 }

src/Repository/RepositoryInterface.php

@@ -25,19 +25,19 @@ interface RepositoryInterface {
 	/**
 	 * @param string $class
 	 * @param array|object $data
+	 * @param bool $withEmpty
 	 * @return mixed
-	 * @throws RepositoryException
 	 */
-	public function createFromData(string $class, array|object $data) : mixed;
+	public function createFromData(string $class, array|object $data, bool $withEmpty = true) : mixed;
 
 
 	/**
 	 * @param object $object
 	 * @param array|object $data
+	 * @param bool $withEmpty
 	 * @return mixed
-	 * @throws RepositoryException
 	 */
-	public function updateFromData(object $object, array|object $data) : mixed;
+	public function updateFromData(object $object, array|object $data, bool $withEmpty = true) : mixed;
 
 
 	/**