20250622#6

README.md

@@ -1,6 +1,6 @@
 ## Rmphp/Storage
 
-DB component for **Rmphp**
+Storage component for **Rmphp**
 
 ## Install
 
@@ -10,12 +10,12 @@ Stable version
 composer require rmphp/storage
 ```
 ```bash
-composer require rmphp/storage:"^5.0"
+composer require rmphp/storage:"^12.0"
 ```
 
 
 Dev version contains the latest changes
 
 ```bash
-composer require rmphp/storage:"5.x-dev"
+composer require rmphp/storage:"12.x-dev"
 ```

composer.json

@@ -9,6 +9,7 @@
 	],
 	"require": {
 		"php": "^8.1",
+		"rmphp/odm": "^1.0",
 		"ext-mysqli": "*"
 	},
 	"autoload": {

src/AbstractMysqlRepository.php

@@ -2,12 +2,16 @@
 
 namespace Rmphp\Storage;
 
-use Rmphp\Storage\Entity\EntityInterface;
+use Rmphp\ODM\ObjectDataMapper;
+use Rmphp\ODM\ODMException;
 use Rmphp\Storage\Mysql\MysqlRepositoryInterface;
 use Rmphp\Storage\Mysql\MysqlResultData;
 use Rmphp\Storage\Mysql\MysqlStorageInterface;
+use Rmphp\Storage\Repository\EntityInterface;
+use Rmphp\Storage\Repository\RepositoryException;
+use Throwable;
 
-abstract class AbstractMysqlRepository extends AbstractRepository implements MysqlRepositoryInterface {
+abstract class AbstractMysqlRepository implements MysqlRepositoryInterface {
 
 	public const DEBUG = false;
 	public const TABLE = null;
@@ -18,48 +22,99 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 	private bool $debug;
 
 	public function __construct(
-		public readonly MysqlStorageInterface $mysql
+		public readonly MysqlStorageInterface $mysql,
+		public readonly ObjectDataMapper $mapper
 	) {}
 
+	/**
+	 * @inheritDoc
+	 */
+	final public function getData(object $object, callable $method = null) : array {
+		try {
+			return $this->mapper->getDataFromObject($object, $method);
+		} catch(ODMException $odmException) {
+			throw new RepositoryException($odmException->getMessage(), $odmException->getCode());
+		}
+	}
 
-	/** @inheritDoc */
+	/**
-	public function createFromResult(string $class, bool|MysqlResultData $result, callable $function = null): mixed {
+	 * @inheritDoc
+	 */
+	final public function createFromData(string $class, array|object $data, bool $withEmpty = true) : object {
+		try{
+			return $this->mapper->createObjectFromData($class, $data, $withEmpty);
+		} catch(ODMException $odmException) {
+			throw new RepositoryException($odmException->getMessage(), $odmException->getCode());
+		}
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	final public function updateFromData(object $object, array|object $data, bool $withEmpty = true) : object {
+		try{
+			return $this->mapper->updateObjectFromData($object, $data, $withEmpty);
+		} catch(ODMException $odmException) {
+			throw new RepositoryException($odmException->getMessage(), $odmException->getCode());
+		}
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	final public function createFromResult(string $class, ?MysqlResultData $result, callable $function = null): mixed {
+		try {
 			if($result instanceof MysqlResultData) {
 				$val = (isset($function)) ? $function($result->fetchOne()) : $result->fetchOne();
-			$out = $this->createFromData($class, $val);
+				$out = $this->mapper->createObjectFromData($class, $val);
 			}
 			return $out ?? null;
+		} catch(ODMException $odmException) {
+			throw new RepositoryException($odmException->getMessage(), $odmException->getCode());
+		}
 	}
 
-
+	/**
-	/** @inheritDoc */
+	 * @inheritDoc
-	public function createListFromResult(string $class, bool|MysqlResultData $result, callable $function = null): array {
+	 */
+	final public function createListFromResult(string $class, ?MysqlResultData $result, callable $function = null): array {
+		try {
 			if($result instanceof MysqlResultData) {
 				foreach($result->fetch() as $resultValue) {
 					$val = (isset($function)) ? $function($resultValue) : $resultValue;
-				$out[] = $this->createFromData($class, $val);
+					$out[] = $this->mapper->createObjectFromData($class, $val);
 				}
 			}
 			return $out ?? [];
+		} catch(ODMException $odmException) {
+			throw new RepositoryException($odmException->getMessage(), $odmException->getCode());
+		}
 	}
 
-
+	/**
-	/** @inheritDoc */
+	 * @inheritDoc
-	public function getEntityById(int $id, string $table = null): mixed {
+	 */
+	final public function getEntityById(int $id, string $table = null): mixed {
+		try {
 			if(!isset($table)) $table = $this->getTable();
-		if($result = $this->mysql->findById($table, $id)) $out = $this->createFromData($this->getEntityClass(), $result);
+			if($result = $this->mysql->findById($table, $id)) $out = $this->mapper->createObjectFromData($this->getEntityClass(), $result);
 			return $out ?? null;
+		} catch(ODMException $odmException) {
+			throw new RepositoryException($odmException->getMessage(), $odmException->getCode());
+		}
 	}
 
-
+	/**
-	/** @inheritDoc */
+	 * @inheritDoc
-	public function saveEntity(EntityInterface $object, string $table = null) : mixed {
+	 */
+	final public function saveEntity(EntityInterface $object, string $table = null) : mixed {
+		try {
 			if(!isset($table)) $table = $this->getTable();
-		$in = $this->getProperties($object, function ($value){
+			$in = $this->mapper->getDataFromObject($object, function ($value){
 				return (is_string($value)) ? $this->mysql->escapeStr($value) : $value;
 			});
-		if($this->getDebug()) {$this->debug($object, $in, $table); 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());
 				return $object->getId();
@@ -67,17 +122,19 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 				$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());}
+		}
+		catch (ODMException|Throwable $throwable) {
+			throw new RepositoryException($throwable->getMessage());
+		}
 	}
 
-
 	/** @inheritDoc */
-	public function saveData(array $data, string $table = null, string $primaryKey = 'id') : mixed {
+	final 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->getDebug()) {$this->debug($data, $in, $table); 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]);
@@ -86,12 +143,11 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 				$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());}
+		} catch (Throwable $throwable) {throw new RepositoryException($throwable->getMessage());}
 	}
 
-
 	/** @inheritDoc */
-	public function saveEntityGroup(array $objects, string $table = null): array {
+	final public function saveEntityGroup(array $objects, string $table = null): array {
 		try{
 			$this->mysql->mysql()->begin_transaction();
 			foreach($objects as $object) $id[] = $this->saveEntity($object, $table);
@@ -104,9 +160,8 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 		}
 	}
 
-
 	/** @inheritDoc */
-	public function saveDataGroup(array $objects, string $table = null, string $primaryKey = 'id'): array {
+	final 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);
@@ -119,9 +174,8 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 		}
 	}
 
-
 	/** @inheritDoc */
-	public function deleteEntity(EntityInterface $object, string $table = null) : bool {
+	final 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());
@@ -129,27 +183,23 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 		return false;
 	}
 
-
 	/** @inheritDoc */
-	public function getStorageLogs() : array {
+	final public function getStorageLogs() : array {
 		return $this->mysql->getLogs();
 	}
 
-
 	/** @inheritDoc */
-	public function setTable(string $table) : void {
+	final public function setTable(string $table) : void {
 		$this->table = $table;
 	}
 
-
 	/** @inheritDoc */
-	public function setEntity(string $entity) : void {
+	final public function setEntity(string $entity) : void {
 		$this->entity = $entity;
 	}
 
-
 	/** @inheritDoc */
-	public function setDebug(bool $debug) : void {
+	final public function setDebug(bool $debug) : void {
 		$this->debug = $debug;
 	}
 
@@ -164,7 +214,6 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 		throw new RepositoryException("Имя таблицы не задано");
 	}
 
-
 	/**
 	 * @return string
 	 * @throws RepositoryException
@@ -175,16 +224,22 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
 		throw new RepositoryException("Не указан объект");
 	}
 
-
 	/**
 	 * @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->mapper->getRepositoryStack(), $this->mapper->getClassesCache(), $this->mapper->getAttributesObjectsCache()];
+	}
+
 	/**
 	 * @param ...$arg
 	 * @return void

src/AbstractRepository.php

@@ -1,102 +0,0 @@
-<?php
-
-namespace Rmphp\Storage;
-
-use ReflectionClass;
-use ReflectionException;
-use ReflectionProperty;
-use Rmphp\Storage\Entity\ValueObjectInterface;
-
-abstract class AbstractRepository implements RepositoryInterface {
-
-	static  array $classes = [];
-
-	/** @inheritDoc */
-	public function createFromData(string $class, $data) : object {
-		try {
-			if(!isset(static::$classes[$class])) static::$classes[$class] = new ReflectionClass($class);
-			return $this->fillObject(static::$classes[$class], new $class, $data);
-		}
-		catch (ReflectionException $exception) {
-			throw new RepositoryException($exception->getMessage());
-		}
-	}
-
-
-	/** @inheritDoc */
-	public function updateFromData(object $object, array $data) : object {
-		try {
-			$class = get_class($object);
-			if(!isset(static::$classes[$class])) static::$classes[$class] = new ReflectionClass($class);
-			return $this->fillObject(static::$classes[$class], clone $object, $data, true);
-		}
-		catch (RepositoryException|ReflectionException $exception) {
-			throw new RepositoryException($exception->getMessage());
-		}
-	}
-
-
-	/**
-	 * @param object $object
-	 * @param callable|null $method
-	 * @return array
-	 * @throws RepositoryException
-	 */
-	public function getProperties(object $object, callable $method = null) : array {
-		try{
-			$class = get_class($object);
-			if(!isset(static::$classes[$class])) static::$classes[$class] = new ReflectionClass($class);
-			/** @var ReflectionProperty $property */
-			foreach(static::$classes[$class]->getProperties() as $property){
-				if(!$property->isInitialized($object) || is_array($property->getValue($object))) continue;
-				if(static::$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){
-					$fieldValue[$property->getName()] = $property->getValue($object)->get();
-				}
-				elseif(is_bool($property->getValue($object))){
-					$fieldValue[$property->getName()] = (int) $property->getValue($object);
-				}
-				else $fieldValue[$property->getName()] = $property->getValue($object);
-				$fieldNameSnakeCase = strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()));
-				if(false !== $fieldValue[$property->getName()]) $out[$fieldNameSnakeCase] = $fieldValue[$property->getName()];
-			}
-			return (isset($method)) ? array_map($method, $out ?? []) : $out ?? [];
-		}
-		catch (ReflectionException $exception) {
-			throw new RepositoryException($exception->getMessage());
-		}
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 * @param object $object
-	 * @param array $data
-	 * @param bool $update
-	 * @return mixed
-	 * @throws RepositoryException
-	 */
-	private function fillObject(ReflectionClass $class, object $object, array $data, bool $update = false) : mixed {
-		try {
-			foreach($class->getProperties() as $property){
-				if($update && !array_key_exists($property->getName(), $data) && !array_key_exists(strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName())), $data)) continue;
-				// data[propertyName] ?? data[property_name] ?? null
-				$value = $data[$property->getName()] ?? $data[strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()))] ?? null;
-				// если есть внутренний метод (приоритетная обработка)
-				if($class->hasMethod('set'.ucfirst($property->getName()))) $object->{'set'.ucfirst($property->getName())}($value);
-				// Если тип свойства класс (valueObject)
-				elseif($property->hasType() && class_exists($property->getType()->getName())) $object->{$property->getName()} = (is_object($value)) ? $value : new ($property->getType()->getName())($value);
-				// если значения не пустое
-				elseif(isset($value)) $object->{$property->getName()} = $value;
-				// если значения может быть пустое
-				elseif($property->getType()->allowsNull()) $object->{$property->getName()} = null;
-			}
-			return $object;
-		}
-		catch (ReflectionException $exception) {
-			throw new RepositoryException($exception->getMessage());
-		}
-	}
-}

src/Mysql/MysqlRepositoryInterface.php

@@ -8,29 +8,58 @@
 
 namespace Rmphp\Storage\Mysql;
 
-use Rmphp\Storage\Entity\EntityInterface;
+use Rmphp\ODM\ObjectDataMapper;
-use Rmphp\Storage\RepositoryException;
+use Rmphp\Storage\Repository\EntityInterface;
-use Rmphp\Storage\RepositoryInterface;
+use Rmphp\Storage\Repository\RepositoryException;
 
-interface MysqlRepositoryInterface extends RepositoryInterface {
+/**
+ * @property MysqlStorageInterface $mysql
+ * @property ObjectDataMapper $mapper
+ */
+interface MysqlRepositoryInterface {
+
+	/**
+	 * @param object $object
+	 * @param callable|null $method
+	 * @return array
+	 * @throws RepositoryException
+	 */
+	public function getData(object $object, callable $method = null) : array;
 
 	/**
 	 * @param string $class
-	 * @param bool|MysqlResultData $result
+	 * @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;
+
+	/**
+	 * @param string $class
+	 * @param MysqlResultData|null $result
 	 * @param callable|null $function
 	 * @return mixed
 	 * @throws RepositoryException
 	 */
-	public function createFromResult(string $class, bool|MysqlResultData $result, callable $function = null): mixed;
+	public function createFromResult(string $class, ?MysqlResultData $result, callable $function = null): mixed;
+
 
 	/**
 	 * @param string $class
-	 * @param bool|MysqlResultData $result
+	 * @param MysqlResultData|null $result
 	 * @param callable|null $function
 	 * @return array
 	 * @throws RepositoryException
 	 */
-	public function createListFromResult(string $class, bool|MysqlResultData $result, callable $function = null): array;
+	public function createListFromResult(string $class, ?MysqlResultData $result, callable $function = null): array;
 
 	/**
 	 * @param int $id

src/Mysql/MysqlStorage.php

@@ -13,19 +13,23 @@ class MysqlStorage implements MysqlStorageInterface {
 	private Mysqli $mysqli;
 
 	/**
-	 * Внутренний конструктор подключения к БД
+	 * @param array $paramsArray
-	 * Mysql constructor.
-	 * @param array $params
 	 * @throws Exception
 	 */
-	public function __construct(array $params) {
+	public function __construct(array $paramsArray) {
-		$this->mysqli = new mysqli($params['host'], $params['user'], $params['pass'], $params['base']);
+		$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");
+		$this->mysqli->set_charset($params->chartset ?? "utf8");
-		if(!empty($params['logsEnable'])) $this->logsEnabled = true;
+		if(!empty($params->logs)) $this->logsEnabled = true;
 	}
 
 	/** @inheritDoc */
@@ -111,7 +115,7 @@ class MysqlStorage implements MysqlStorageInterface {
 
 
 	/** @inheritDoc */
-	public function find(string $sql, int $ln=0, int $numPage=1, int $count=0): bool|MysqlResultData {
+	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;
@@ -124,7 +128,7 @@ 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 MysqlResultData($result);
 		$data->count = $cnts ?? 0;
@@ -133,17 +137,17 @@ class MysqlStorage implements MysqlStorageInterface {
 	}
 
 	/** @inheritDoc */
-	public function findOne(string $sql) : bool|MysqlResultData {
+	public function findOne(string $sql) : ?MysqlResultData {
 		$result = $this->query($sql." limit 0, 1");
-		if (!$result || $result->num_rows == 0) return false;
+		if (!$result || $result->num_rows == 0) return null;
 		return new MysqlResultData($result);
 	}
 
 	/** @inheritDoc */
-	public function findById(string $table, mixed $id, string $name = 'id') : bool|array {
+	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 false;
+		if (!$result || $result->num_rows == 0) return null;
 		$data = new MysqlResultData($result);
 		return $data->fetchOne();
 	}

src/Mysql/MysqlStorageInterface.php

@@ -82,13 +82,13 @@ interface MysqlStorageInterface {
 	 * @param int $count
 	 * @return bool|MysqlResultData
 	 */
-	public function find(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : bool|MysqlResultData;
+	public function find(string $sql, int $ln = 0, int $numPage = 1, int $count=0) : ?MysqlResultData;
 
 	/**
 	 * @param string $sql
 	 * @return bool|array
 	 */
-	public function findOne(string $sql) : bool|MysqlResultData;
+	public function findOne(string $sql) : ?MysqlResultData;
 
 	/**
 	 * @param string $table
@@ -96,7 +96,7 @@ interface MysqlStorageInterface {
 	 * @param string $name
 	 * @return bool|array
 	 */
-	public function findById(string $table, mixed $id, string $name = 'id') : bool|array;
+	public function findById(string $table, mixed $id, string $name = 'id') : ?array;
 
 	/**
 	 * Метод экранирования данных с учетом текущего подключения в т.ч для LIKE

src/Repository/AbstractEntity.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rmphp\Storage\Entity;
+namespace Rmphp\Storage\Repository;
 
 abstract class AbstractEntity implements EntityInterface {
 
@@ -8,7 +8,7 @@ abstract class AbstractEntity implements EntityInterface {
 	 * @return mixed
 	 */
 	public function getId(): mixed {
-		return (isset($this->id)) ? (($this->id instanceof ValueObjectInterface) ? $this->id->get() : $this->id) : null;
+		return (isset($this->id)) ? (($this->id instanceof ValueObjectInterface) ? $this->id->getValue() : $this->id) : null;
 	}
 
 	/**
@@ -25,7 +25,15 @@ abstract class AbstractEntity implements EntityInterface {
 	 * @return string
 	 */
 	public function __get(string $name) {
-		return $this->$name ?? "";
+		return $this->$name ?? null;
+	}
+
+	/**
+	 * @param string $name
+	 * @return bool
+	 */
+	public function __isset(string $name): bool {
+		return isset($this->$name);
 	}
 
 }

src/Repository/EntityInterface.php

@@ -6,7 +6,7 @@
  * Time: 3:58
  */
 
-namespace Rmphp\Storage\Entity;
+namespace Rmphp\Storage\Repository;
 
 interface EntityInterface {
 

src/Repository/RepositoryException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rmphp\Storage;
+namespace Rmphp\Storage\Repository;
 
 use Throwable;
 

src/Repository/ValueObjectInterface.php

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

src/RepositoryInterface.php

@@ -1,42 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Zuev Yuri
- * Date: 12.01.2025
- * Time: 21:48
- */
-
-namespace Rmphp\Storage;
-
-use ReflectionException;
-use Rmphp\Storage\Entity\EntityInterface;
-
-interface RepositoryInterface {
-
-	/**
-	 * @param string $class
-	 * @param $data
-	 * @return object
-	 * @throws RepositoryException
-	 */
-	public function createFromData(string $class, $data) : mixed;
-
-
-	/**
-	 * @param object $object
-	 * @param array $data
-	 * @return mixed
-	 * @throws RepositoryException
-	 */
-	public function updateFromData(object $object, array $data) : mixed;
-
-
-	/**
-	 * @param object $object
-	 * @param callable|null $method
-	 * @return array
-	 * @throws RepositoryException
-	 */
-	public function getProperties(object $object, callable $method = null) : array;
-
-}