20250509#1

README.md

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

src/AbstractMysqlRepository.php

@@ -0,0 +1,207 @@
+<?php
+
+namespace Rmphp\Storage;
+
+use Rmphp\Storage\Entity\EntityInterface;
+use Rmphp\Storage\Exception\RepositoryException;
+use Rmphp\Storage\Mysql\MysqlRepositoryInterface;
+use Rmphp\Storage\Mysql\MysqlResultData;
+use Rmphp\Storage\Mysql\MysqlStorageInterface;
+use Rmphp\Storage\Repository\AbstractRepository;
+
+abstract class AbstractMysqlRepository extends AbstractRepository implements MysqlRepositoryInterface {
+
+	public const DEBUG = false;
+	public const TABLE = null;
+	public const ENTITY = null;
+
+	private string $table;
+	private string $entity;
+	private bool $debug;
+
+	public function __construct(
+		public readonly MysqlStorageInterface $mysql
+	) {}
+
+
+	/** @inheritDoc */
+	public function createFromResult(string $class, bool|MysqlResultData $result, callable $function = null): mixed {
+		if($result instanceof MysqlResultData) {
+			$val = (isset($function)) ? $function($result->fetchOne()) : $result->fetchOne();
+			$out = $this->createFromData($class, $val);
+		}
+		return $out ?? null;
+	}
+
+
+	/** @inheritDoc */
+	public function createListFromResult(string $class, bool|MysqlResultData $result, callable $function = null): array {
+		if($result instanceof MysqlResultData) {
+			foreach($result->fetch() as $resultValue) {
+				$val = (isset($function)) ? $function($resultValue) : $resultValue;
+				$out[] = $this->createFromData($class, $val);
+			}
+		}
+		return $out ?? [];
+	}
+
+
+	/** @inheritDoc */
+	public function getEntityById(int $id, string $table = null): mixed {
+		if(!isset($table)) $table = $this->getTable();
+		if($result = $this->mysql->findById($table, $id)) $out = $this->createFromData($this->getEntityClass(), $result);
+		return $out ?? null;
+	}
+
+
+	/** @inheritDoc */
+	public function saveEntity(EntityInterface $object, string $table = null) : mixed {
+		if(!isset($table)) $table = $this->getTable();
+		$in = $this->getProperties($object, function ($value){
+			return (is_string($value)) ? $this->mysql->escapeStr($value) : $value;
+		});
+		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());
+				return $object->getId();
+			} else {
+				$this->mysql->insert($table, $in);
+				return (is_string($object->getId())) ? $object->getId() : $this->mysql->mysql()->insert_id;
+			}
+		} catch (\Throwable $throwable) {throw new RepositoryException($throwable->getMessage());}
+	}
+
+
+	/** @inheritDoc */
+	public function saveData(array $data, string $table = null, string $primaryKey = 'id') : mixed {
+		if(!isset($table)) $table = $this->getTable();
+		$in = array_map(function ($value){
+			return (is_string($value)) ? $this->mysql->escapeStr($value) : $value;
+		}, $data);
+		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]);
+				return $data[$primaryKey];
+			} else {
+				$this->mysql->insert($table, $in);
+				return (is_string($data[$primaryKey])) ? $data[$primaryKey] : $this->mysql->mysql()->insert_id;
+			}
+		} catch (\Throwable $throwable) {throw new RepositoryException($throwable->getMessage());}
+	}
+
+
+	/** @inheritDoc */
+	public function saveEntityGroup(array $objects, string $table = null): array {
+		try{
+			$this->mysql->mysql()->begin_transaction();
+			foreach($objects as $object) $id[] = $this->saveEntity($object, $table);
+			$this->mysql->mysql()->commit();
+			return $id ?? [];
+		}
+		catch (\Exception $exception){
+			$this->mysql->mysql()->rollback();
+			throw new RepositoryException($exception->getMessage());
+		}
+	}
+
+
+	/** @inheritDoc */
+	public function saveDataGroup(array $objects, string $table = null, string $primaryKey = 'id'): array {
+		try{
+			$this->mysql->mysql()->begin_transaction();
+			foreach($objects as $object) $id[] = $this->saveData($object, $table, $primaryKey);
+			$this->mysql->mysql()->commit();
+			return $id ?? [];
+		}
+		catch (\Exception $exception){
+			$this->mysql->mysql()->rollback();
+			throw new RepositoryException($exception->getMessage());
+		}
+	}
+
+
+	/** @inheritDoc */
+	public function deleteEntity(EntityInterface $object, string $table = null) : bool {
+		if(!isset($table)) $table = $this->getTable();
+		if(!empty($object->getId())){
+			return $this->mysql->deleteById($table, $object->getId());
+		}
+		return false;
+	}
+
+
+	/** @inheritDoc */
+	public function getStorageLogs() : array {
+		return $this->mysql->getLogs();
+	}
+
+
+	/** @inheritDoc */
+	public function setTable(string $table) : void {
+		$this->table = $table;
+	}
+
+
+	/** @inheritDoc */
+	public function setEntity(string $entity) : void {
+		$this->entity = $entity;
+	}
+
+
+	/** @inheritDoc */
+	public function setDebug(bool $debug) : void {
+		$this->debug = $debug;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws RepositoryException
+	 */
+	private function getTable() : string {
+		if(!empty($this->table)) return $this->table;
+		if(!empty(static::TABLE)) return static::TABLE;
+		throw new RepositoryException("Имя таблицы не задано");
+	}
+
+
+	/**
+	 * @return string
+	 * @throws RepositoryException
+	 */
+	private function getEntityClass() : string {
+		if(!empty($this->entity)) return $this->entity;
+		if(!empty(static::ENTITY)) return static::ENTITY;
+		throw new RepositoryException("Не указан объект");
+	}
+
+
+	/**
+	 * @return 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
+	 */
+	protected function debug(...$arg) : void {
+		if(function_exists('dd')) dd(...$arg);
+		if(function_exists('vdd')) vdd(...$arg);
+		var_dump(...$arg);
+	}
+
+}

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 ?string $propertyName = null,
+		public bool $firstProperty = false
+	) {}
+
+}

src/Attribute/ValueObjectFirstProperty.php

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

src/Attribute/ValueObjectPropertyName.php

@@ -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/Component/AbstractDataObject.php

@@ -0,0 +1,134 @@
+<?php
+
+namespace Rmphp\Storage\Component;
+
+use Exception;
+use ReflectionClass;
+use ReflectionException;
+use Rmphp\Storage\Attribute\Data;
+use Rmphp\Storage\Attribute\DataIgnorEmpty;
+
+abstract class AbstractDataObject {
+
+	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, 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()];
+				}
+				// значение в массиве по ключю с именем свойства в snake case
+				elseif(array_key_exists(strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName())), $data)){
+					$value[$property->getName()] = $data[strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()))];
+				}
+				elseif($update) {
+					continue;
+				}
+
+				// если есть внутренний метод (приоритетная обработка)
+				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()]) && $value[$property->getName()] !== ""){
+						$object->{$property->getName()} = new ($property->getType()->getName())($value[$property->getName()]);
+						$case[$property->getName()] = 'VO: NewInstance';
+					}
+					// Значения нет и VO может быть без параметров
+					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;
+		}
+		catch (ReflectionException $exception) {
+			throw new Exception($exception->getMessage());
+		}
+	}
+
+
+	/**
+	 * @throws ReflectionException
+	 */
+	private static function isEmptyAvailable(string $class) : bool {
+		if(isset(self::$constructorEmptyAvailableClasses[$class])) return self::$constructorEmptyAvailableClasses[$class];
+		if(!$constructor = (new \ReflectionClass($class))->getConstructor()) return self::$constructorEmptyAvailableClasses[$class] = false;
+		foreach($constructor->getParameters() as $param){
+			if(!$param->isDefaultValueAvailable()){
+				return self::$constructorEmptyAvailableClasses[$class] = false;
+			}
+		}
+		return self::$constructorEmptyAvailableClasses[$class] = true;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getFillObjectStack() : array {
+		return self::$stack;
+	}
+
+}

src/Entity/AbstractEntity.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rmphp\Storage\Entity;
+
+abstract class AbstractEntity implements EntityInterface {
+
+	/**
+	 * @return mixed
+	 */
+	public function getId(): mixed {
+		return (isset($this->id)) ? (($this->id instanceof ValueObjectInterface) ? $this->id->getValue() : $this->id) : null;
+	}
+
+	/**
+	 * @param string $name
+	 * @param $value
+	 * @return void
+	 */
+	public function __set(string $name, $value): void {
+		$this->$name = $value;
+	}
+
+	/**
+	 * @param string $name
+	 * @return string
+	 */
+	public function __get(string $name) {
+		return $this->$name ?? null;
+	}
+
+	/**
+	 * @param string $name
+	 * @return bool
+	 */
+	public function __isset(string $name): bool {
+		return isset($this->$name);
+	}
+
+}

src/Entity/EntityInterface.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zuev Yuri
+ * Date: 23.04.2024
+ * Time: 3:58
+ */
+
+namespace Rmphp\Storage\Entity;
+
+interface EntityInterface {
+
+	/**
+	 * @return mixed
+	 */
+	public function getId(): mixed;
+
+}

src/Entity/ValueObjectInterface.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Rmphp\Storage\Entity;
+
+interface ValueObjectInterface {
+
+	public function __toString(): string;
+
+}

src/Exception/RepositoryException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rmphp\Storage\Exception;
+
+use Throwable;
+
+class RepositoryException extends \Exception {
+
+	public array $data;
+
+	public function __construct($message="", $code=0, array $data = [], Throwable $previous=null) {
+		parent::__construct($message, $code, $previous);
+		$this->data = $data;
+	}
+
+}

src/Mysql/Exception/MysqlException.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Rmphp\Storage\Mysql\Exception;
-
-
-class MysqlException extends \Exception {
-
-}

src/Mysql/MysqlRepositoryInterface.php

@@ -0,0 +1,108 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zuev Yuri
+ * Date: 12.01.2025
+ * Time: 21:44
+ */
+
+namespace Rmphp\Storage\Mysql;
+
+use Rmphp\Storage\Entity\EntityInterface;
+use Rmphp\Storage\Exception\RepositoryException;
+use Rmphp\Storage\Repository\RepositoryInterface;
+
+interface MysqlRepositoryInterface extends RepositoryInterface {
+
+	/**
+	 * @param string $class
+	 * @param bool|MysqlResultData $result
+	 * @param callable|null $function
+	 * @return mixed
+	 * @throws RepositoryException
+	 */
+	public function createFromResult(string $class, bool|MysqlResultData $result, callable $function = null): mixed;
+
+	/**
+	 * @param string $class
+	 * @param bool|MysqlResultData $result
+	 * @param callable|null $function
+	 * @return array
+	 * @throws RepositoryException
+	 */
+	public function createListFromResult(string $class, bool|MysqlResultData $result, callable $function = null): array;
+
+	/**
+	 * @param int $id
+	 * @param string|null $table
+	 * @return mixed
+	 * @throws RepositoryException
+	 */
+	public function getEntityById(int $id, string $table = null): mixed;
+
+	/**
+	 * @param EntityInterface $object
+	 * @param string|null $table
+	 * @return mixed
+	 * @throws RepositoryException
+	 */
+	public function saveEntity(EntityInterface $object, string $table = null) : mixed;
+
+	/**
+	 * @param array $data
+	 * @param string|null $table
+	 * @param string $primaryKey
+	 * @return mixed
+	 * @throws RepositoryException
+	 */
+	public function saveData(array $data, string $table = null, string $primaryKey = 'id') : mixed;
+
+	/**
+	 * @param array $objects
+	 * @param string|null $table
+	 * @return array
+	 * @throws RepositoryException
+	 */
+	public function saveEntityGroup(array $objects, string $table = null): array;
+
+	/**
+	 * @param array $objects
+	 * @param string|null $table
+	 * @param string $primaryKey
+	 * @return array
+	 * @throws RepositoryException
+	 */
+	public function saveDataGroup(array $objects, string $table = null, string $primaryKey = 'id'): array;
+
+	/**
+	 * @param EntityInterface $object
+	 * @param string|null $table
+	 * @return bool
+	 * @throws RepositoryException
+	 */
+	public function deleteEntity(EntityInterface $object, string $table = null) : bool;
+
+	/**
+	 * @return array
+	 */
+	public function getStorageLogs() : array;
+
+	/**
+	 * @param string $table
+	 * @return void
+	 */
+	public function setTable(string $table) : void;
+
+	/**
+	 * @param string $entity
+	 * @return void
+	 */
+	public function setEntity(string $entity) : void;
+
+	/**
+	 * @param bool $debug
+	 * @return void
+	 */
+	public function setDebug(bool $debug) : void;
+
+}

src/Mysql/MysqlResultData.php

@@ -3,7 +3,7 @@
 namespace Rmphp\Storage\Mysql;
 
 
-class MysqlStorageData {
+class MysqlResultData {
 
 	private ?\mysqli_result $result;
 	private array $arrayData = [];
@@ -35,14 +35,14 @@ class MysqlStorageData {
 	/**
 	 * @return iterable
 	 */
-	public function fatch(): iterable {
+	public function fetch(): iterable {
 		if(!empty($this->arrayData)) return $this->arrayData;
 		if(!$this->result) return [];
 		return $this->generator();
 	}
 
 
-	public function fatchOne(int $index = 0) : array {
+	public function fetchOne(int $index = 0) : array {
 		if(!$this->result) return [];
 		$this->result->data_seek($index);
 		return $this->result->fetch_assoc();

src/Mysql/MysqlStorage.php

@@ -13,19 +13,23 @@ class MysqlStorage implements MysqlStorageInterface {
 	private Mysqli $mysqli;
 
 	/**
-	 * Внутренний конструктор подключения к БД
-	 * Mysql constructor.
-	 * @param array $params
+	 * @param array $paramsArray
 	 * @throws Exception
 	 */
-	public function __construct(array $params) {
-		$this->mysqli = new mysqli($params['host'], $params['user'], $params['pass'], $params['base']);
+	public function __construct(array $paramsArray) {
+		$params = (object) $paramsArray;
+		$this->mysqli = new mysqli(
+			$params->host,
+			$params->user,
+			$params->pass,
+			$params->base
+		);
 		// выводим ошибку при неудачном подключении
 		if ($this->mysqli->connect_errno) {
 			throw new Exception($this->mysqli->connect_errno);
 		}
-		$this->mysqli->set_charset("utf8");
-		if(!empty($params['logsEnable'])) $this->logsEnabled = true;
+		$this->mysqli->set_charset($params->chartset ?? "utf8");
+		if(!empty($params->logs)) $this->logsEnabled = true;
 	}
 
 	/** @inheritDoc */
@@ -38,82 +42,85 @@ class MysqlStorage implements MysqlStorageInterface {
 	{
 		try{
 			$result = $this->mysqli->query($sql);
-			// запись в log
-			($this->mysqli->errno)
-				? $this->addLog("Err - SQL: ".$sql." | error: ".$this->mysqli->error)
-				: $this->addLog("OK - ".$sql);
+			if($this->mysqli->errno) throw new Exception();
+			$this->addLog("OK - $sql");
 			return $result;
 		}
-		/* 8.1.0 Теперь по умолчанию установлено значение MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT и выбрасывается исключение. Ранее оно было MYSQLI_REPORT_OFF. */
 		catch (Exception $exception){
-			$this->addLog("Err - SQL: ".$sql." | error: ".$this->mysqli->error);
+			$this->addLog("Err - SQL: $sql | error: ".$this->mysqli->error);
 			return false;
 		}
 	}
 
-	/** @inheritDoc */
-	public function add(string $tbl, array $arr, bool $update = false) : bool {
-		foreach ($arr as $key => $value) {
-			$col[] = "`$key`";
-			$val[] = ($value !== NULL) ? "'$value'" : "NULL";
-			$upd[] = ($value !== NULL) ? "`$key`='$value'" : "`$key`=NULL";
-		}
-		// Собираем в строки для использования в запросе
-		$col = implode(", ", $col);
-		$val = implode(", ", $val);
 
+	/** @inheritDoc */
+	public function insert(string $table, array $data, bool $update = false) : bool {
+		$chunks = $this->getInsertValue($data);
+		$upd = $this->getUpdateValue($data);
 		if (!$update) {
-			$sql = "insert low_priority into ".$this->escapeStr($tbl)." (".$col.") values (" . $val . ")";
+			$sql = "insert low_priority into ".$this->escapeStr($table)." (".implode(",", $chunks['columns']).") values (".implode(",", $chunks['values']).")";
 		} else{
-			$sql = "insert low_priority into ".$this->escapeStr($tbl)." (".$col.") values (".$val.") on duplicate key update ".implode(", ", $upd);
+			$sql = "insert low_priority into ".$this->escapeStr($table)." (".implode(",", $chunks['columns']).") values (".implode(",", $chunks['values']).") on duplicate key update ".implode(",", $upd);
 		}
 		return $this->query($sql);
 	}
 
 	/** @inheritDoc */
-	public function edit(string $tbl, array $arr, string $case, bool $ignore=false) : bool {
-		foreach ($arr as $key => $value) {
-			$isql[] = ($value !== NULL) ? "`$key`='$value'" : "`$key`=NULL";
-		}
-		$where = (preg_match("'^[0-9]+$'",$case)) ? "id = '".(int) $case."'" : $case;
-		if(empty($ignore)) {
-			$sql = "update low_priority " . $this->escapeStr($tbl) . " set " . implode(", ", $isql) . " where " . $where;
-		} else {
-			$sql = "update low_priority ignore " . $this->escapeStr($tbl) . " set " . implode(", ", $isql) . " where " . $where;
+	public function batchInsert(string $table, array $data) : bool {
+		foreach($data as $insertRow){
+			$chunks = $this->getInsertValue($insertRow);
+			$values[] = "(".implode(",", $chunks['values']).")";
 		}
+		$sql = "insert low_priority into ".$this->escapeStr($table)." (".implode(",", $chunks['columns'] ?? []).") values ".implode(",", $values ?? []);
 		return $this->query($sql);
 	}
 
 	/** @inheritDoc */
-	public function replace(string $tbl, array $arr) : bool {
-		foreach ($arr as $key => $value) {
-			$col[] = "`$key`";
-			$val[] = ($value !== NULL) ? "'$value'" : "NULL";
-		}
-		// Собираем в строки для использования в запросе
-		$col = implode(", ", $col);
-		$val = implode(", ", $val);
-
-		$sql  = "replace low_priority into ".$this->escapeStr($tbl)." (".$col.") values (".$val.")";
+	public function updateById(string $table, array $data, mixed $id, array $modifier = []) : bool {
+		$chunks = $this->getUpdateValue($data);
+		$id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id);
+		$sql = "update low_priority ".implode(" ", $modifier)." ".$this->escapeStr($table)." set ".implode(",", $chunks)." where id = '$id'";
 		return $this->query($sql);
 	}
 
 	/** @inheritDoc */
-	public function del(string $tbl, string $case) : bool {
-		$where = (preg_match("'^[0-9]+$'",$case)) ? "id = '".(int) $case."'" : $case;
-		$sql = "delete low_priority from ".$this->escapeStr($tbl)." where ".$where;
+	public function updateByParam(string $table, array $data, string $case, array $modifier = []) : bool {
+		$chunks = $this->getUpdateValue($data);
+		$sql = "update low_priority ".implode(" ", $modifier)." ".$this->escapeStr($table)." set ". implode(",", $chunks)." where ".$case;
+		return $this->query($sql);
+	}
+
+	/** @inheritDoc */
+	public function replace(string $table, array $data) : bool {
+		$chunks = $this->getInsertValue($data);
+		$sql  = "replace low_priority into ".$this->escapeStr($table)." (".implode(",", $chunks['columns']).") values (".implode(",", $chunks['values']).")";
+		return $this->query($sql);
+	}
+
+
+	/** @inheritDoc */
+	public function deleteById(string $table, mixed $id) : bool {
+		$id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id);
+		$sql = "delete low_priority from ".$this->escapeStr($table)." where id='$id'";
 		// возвращаем число затронутых строк/false
 		return $this->query($sql);
 	}
 
 	/** @inheritDoc */
-	public function read(string $sql, int $ln=0, int $numPage=1, int $count=0): bool|MysqlStorageData {
+	public function deleteByParam(string $table, string $case) : bool {
+		$sql = "delete low_priority from ".$this->escapeStr($table)." where ".$case;
+		// возвращаем число затронутых строк/false
+		return $this->query($sql);
+	}
+
+
+	/** @inheritDoc */
+	public function find(string $sql, int $ln=0, int $numPage=1, int $count=0): ?MysqlResultData {
 
 		if ($ln > 1) {
 			$cnts = (!empty($count)) ? $count : $this->query($sql)->num_rows;
 		}
 
-		// часть строки запроса с лимит
 		switch (true){
 			case ($ln > 1 || $numPage > 1) : $limit = " limit ".(($numPage * $ln) - $ln).", ".$ln; break;
 			case ($ln == 1): $limit = " limit 0, 1"; break;
@@ -121,38 +128,44 @@ class MysqlStorage implements MysqlStorageInterface {
 		}
 
 		$result = $this->query($sql.$limit);
-		if (!$result || $result->num_rows == 0) return false;
+		if (!$result || $result->num_rows == 0) return null;
 
-		$data = new MysqlStorageData($result);
+		$data = new MysqlResultData($result);
 		$data->count = $cnts ?? 0;
 		$data->hex = md5($sql);
 		return $data;
 	}
 
-
-
 	/** @inheritDoc */
-	public function chktbl(string $tbl) : bool {
-		$result = $this->mysqli->query("SHOW TABLES LIKE '".$this->escapeStr($tbl)."'");
-		if ($result->num_rows == 0) {
-			$this->addLog(__METHOD__.":"." Err - Table ".$tbl." doesn't exist"); return false;
-		}
-		$this->addLog(__METHOD__.":"." OK - Table ".$tbl." exist");
-		return true;
+	public function findOne(string $sql) : ?MysqlResultData {
+		$result = $this->query($sql." limit 0, 1");
+		if (!$result || $result->num_rows == 0) return null;
+		return new MysqlResultData($result);
 	}
 
 	/** @inheritDoc */
-	public function escapeReg(string $var) : ?string {
-		if(!isset($var)) return null;
-		return trim(addcslashes($this->mysqli->real_escape_string($var), "%_"));
+	public function findById(string $table, mixed $id, string $name = 'id') : ?array {
+		$id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id);
+		$result = $this->query("select * from ".$this->escapeStr($table)." where `$name`='$id' limit 0, 1");
+		if (!$result || $result->num_rows == 0) return null;
+		$data = new MysqlResultData($result);
+		return $data->fetchOne();
+	}
+
+
+	/** @inheritDoc */
+	public function escapeReg(string $string) : ?string {
+		if(!isset($string)) return null;
+		return trim(addcslashes($this->mysqli->real_escape_string($string), "%_"));
 	}
 
 	/** @inheritDoc */
-	public function escapeStr(?string $var) : ?string {
-		if(!isset($var)) return null;
-		return trim($this->mysqli->real_escape_string($var));
+	public function escapeStr(?string $string) : ?string {
+		if(!isset($string)) return null;
+		return trim($this->mysqli->real_escape_string($string));
 	}
 
+
 	/** @inheritDoc */
 	public function addLog(string $log) : void {
 		if($this->logsEnabled) $this->log[] = $log;
@@ -168,4 +181,31 @@ class MysqlStorage implements MysqlStorageInterface {
 		return $this->log[count($this->log)-1];
 	}
 
+
+	/**
+	 * @param array $array
+	 * @return array[]
+	 */
+	private function getInsertValue(array $array) : array {
+		foreach ($array as $key => $value) {
+			$colunms[] = "`$key`";
+			$values[] = ($value !== NULL) ? "'$value'" : "NULL";
+		}
+		return [
+			"columns" => $colunms ?? [],
+			"values" => $values ?? []
+		];
+	}
+
+	/**
+	 * @param array $array
+	 * @return array
+	 */
+	private function getUpdateValue(array $array) : array {
+		foreach ($array as $key => $value) {
+			$out[] = ($value !== NULL) ? "`$key`='$value'" : "`$key`=NULL";
+		}
+		return $out ?? [];
+	}
+
 }

src/Mysql/MysqlStorageInterface.php

@@ -2,82 +2,115 @@
 
 namespace Rmphp\Storage\Mysql;
 
+use Mysqli;
+use mysqli_result;
+
 interface MysqlStorageInterface {
 
 	/**
-	 * @return \Mysqli
+	 * @return Mysqli
 	 */
-	public function mysql() : \Mysqli;
+	public function mysql() : Mysqli;
 
 	/**
 	 * Метод прямого запроса к текущей БД
 	 * @param string $sql
-	 * @return bool|\mysqli_result
+	 * @return bool|mysqli_result
 	 */
-	public function query(string $sql) : bool|\mysqli_result;
+	public function query(string $sql) : bool|mysqli_result;
 
 	/**
 	 * Метод добавления записи в текущую БД
-	 * @param string $tbl
-	 * @param array $arr
+	 * @param string $table
+	 * @param array $data
 	 * @param bool $update
 	 * @return bool
 	 */
-	public function add(string $tbl, array $arr, bool $update = false) : bool;
+	public function insert(string $table, array $data, bool $update = false) : bool;
+
+	/**
+	 * @param string $table
+	 * @param array $data
+	 * @return bool
+	 */
+	public function batchInsert(string $table, array $data) : bool;
 
 	/**
 	 * Метод редактирования записи в текущей БД по ID
-	 * @param string $tbl
-	 * @param array $arr
+	 * @param string $table
+	 * @param array $data
+	 * @param mixed $id
+	 * @param array $modifier
+	 * @return bool
+	 */
+	public function updateById(string $table, array $data, mixed $id, array $modifier = []) : bool;
+
+	/**
+	 * @param string $table
+	 * @param array $data
 	 * @param string $case
-	 * @param bool $ignore
+	 * @param array $modifier
 	 * @return bool
 	 */
-	public function edit(string $tbl, array $arr, string $case, bool $ignore=false) : bool;
+	public function updateByParam(string $table, array $data, string $case, array $modifier = []) : bool;
 
 	/**
-	 * Метод добавления записи в текущую БД
-	 * @param string $tbl
-	 * @param array $arr
+	 * @param string $table
+	 * @param array $data
 	 * @return bool
 	 */
-	public function replace(string $tbl, array $arr) : bool;
+	public function replace(string $table, array $data) : bool;
 
 	/**
-	 * @param string $tbl
+	 * @param string $table
+	 * @param mixed $id
+	 * @return bool
+	 */
+	public function deleteById(string $table, mixed $id) : bool;
+
+	/**
+	 * @param string $table
 	 * @param string $case
 	 * @return bool
 	 */
-	public function del(string $tbl, string $case) : bool;
+	public function deleteByParam(string $table, string $case) : bool;
 
 	/**
 	 * @param string $sql
 	 * @param int $ln
 	 * @param int $numPage
 	 * @param int $count
-	 * @return bool|MysqlStorageData
+	 * @return bool|MysqlResultData
 	 */
-	public function read(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : bool|MysqlStorageData;
+	public function find(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : ?MysqlResultData;
 
 	/**
-	 * @param string $tbl
-	 * @return bool
+	 * @param string $sql
+	 * @return bool|array
 	 */
-	public function chktbl(string $tbl) : bool;
+	public function findOne(string $sql) : ?MysqlResultData;
+
+	/**
+	 * @param string $table
+	 * @param mixed $id
+	 * @param string $name
+	 * @return bool|array
+	 */
+	public function findById(string $table, mixed $id, string $name = 'id') : ?array;
 
 	/**
 	 * Метод экранирования данных с учетом текущего подключения в т.ч для LIKE
-	 * @param string $var
+	 * @param string $string
 	 * @return string|null
 	 */
-	public function escapeReg(string $var) : ?string;
+	public function escapeReg(string $string) : ?string;
 
 	/**
 	 * Метод экранирования данных с учетом текущего подключения
-	 * @param string|null $var
+	 * @param string|null $string
 	 * @return string|null
 	 */
-	public function escapeStr(?string $var) : ?string;
+	public function escapeStr(?string $string) : ?string;
 
 	/**
 	 * Метод наполнения статичного массива с логами

src/Repository/AbstractRepository.php

@@ -0,0 +1,169 @@
+<?php
+
+namespace Rmphp\Storage\Repository;
+
+use Exception;
+use ReflectionClass;
+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\ValueObjectFirstProperty;
+use Rmphp\Storage\Attribute\ValueObjectPropertyName;
+use Rmphp\Storage\Component\AbstractDataObject;
+use Rmphp\Storage\Exception\RepositoryException;
+
+abstract class AbstractRepository extends AbstractDataObject implements RepositoryInterface {
+
+	/** @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(!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())){
+						$valueObjectClass = get_class($property->getValue($object));
+						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();
+							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($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->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));
+							}
+						}
+						elseif(self::$classes[$valueObjectClass]->hasMethod('getValue')){
+							$fieldValue[$property->getName()] = $property->getValue($object)->getValue();
+						}
+					}
+					elseif(is_bool($property->getValue($object))){
+						$fieldValue[$property->getName()] = (int)$property->getValue($object);
+					}
+					else{
+						$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()]) {
+						$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) {
+			throw new RepositoryException($exception->getMessage());
+		}
+	}
+
+
+	/**
+	 * @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, false, $withEmpty);
+		}
+		catch (Exception $exception) {
+			throw new RepositoryException($exception->getMessage());
+		}
+	}
+
+
+	/**
+	 * @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, $withEmpty);
+		}
+		catch (Exception $exception) {
+			throw new RepositoryException($exception->getMessage());
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getRepositoryStack() : array {
+		return $this->getFillObjectStack();
+	}
+
+	/**
+	 * @return 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

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zuev Yuri
+ * Date: 12.01.2025
+ * Time: 21:48
+ */
+
+namespace Rmphp\Storage\Repository;
+
+
+use Rmphp\Storage\Exception\RepositoryException;
+
+interface RepositoryInterface {
+
+	/**
+	 * @param object $object
+	 * @param callable|null $method
+	 * @return array
+	 * @throws RepositoryException
+	 */
+	public function getProperties(object $object, callable $method = null) : array;
+
+
+	/**
+	 * @param string $class
+	 * @param array|object $data
+	 * @param bool $withEmpty
+	 * @return 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
+	 */
+	public function updateFromData(object $object, array|object $data, bool $withEmpty = true) : mixed;
+
+
+	/**
+	 * @return array
+	 */
+	public function getRepositoryStack() : array;
+
+}