15 Commits
3.1 ... 7.x

Author SHA1 Message Date
User
c516546b5d 20250326#1 2025-03-26 16:02:27 +03:00
User
945c95441f 20250321#1 2025-03-21 21:46:19 +03:00
User
d0e38875e6 20250224#3 2025-02-24 19:22:20 +03:00
User
73c9af71ab 20250224#2 2025-02-24 19:02:59 +03:00
User
5b0c0bc7b4 20250224#1 2025-02-24 18:33:53 +03:00
User
dfbcfdf321 20250222#1 2025-02-22 16:22:21 +03:00
User
a54b55cc4e 20250218#5 2025-02-18 02:34:04 +03:00
User
612132f938 20250218#4 2025-02-18 02:32:22 +03:00
User
73b7cb3a5f 20250218#3 2025-02-18 01:24:05 +03:00
User
4f7993750c 20250218#2 2025-02-18 01:08:03 +03:00
User
bdff890b41 20250218#1 2025-02-18 00:14:52 +03:00
User
e390bc262e 20250128#2 2025-01-28 03:32:28 +03:00
User
2afc439354 20250128#1 2025-01-28 03:31:47 +03:00
User
2cfc92584c 20250126#2 2025-01-26 14:56:59 +03:00
User
ac572cc92b 20250113#1 2025-01-13 04:23:59 +03:00
15 changed files with 659 additions and 28 deletions

View File

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

View File

@@ -16,5 +16,5 @@
"Rmphp\\Storage\\": "src/" "Rmphp\\Storage\\": "src/"
} }
} }
} }

View File

@@ -0,0 +1,200 @@
<?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->getDebug()) {$this->debug($object, $in, $table, $this->getRepositoryStack()); 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->getDebug()) {$this->debug($data, $in, $table, $this->getRepositoryStack()); 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 getDebug(): bool {
if(!empty($this->debug)) return $this->debug;
if(!empty(static::DEBUG)) return static::DEBUG;
return false;
}
/**
* @param ...$arg
* @return void
*/
protected function debug(...$arg) : void {
if(function_exists('dd')) dd(...$arg);
if(function_exists('vdd')) vdd(...$arg);
var_dump(...$arg);
}
}

View File

@@ -0,0 +1,104 @@
<?php
namespace Rmphp\Storage\Component;
use Exception;
use ReflectionClass;
use ReflectionException;
class AbstractDataObject {
private static array $constructorEmptyAvailableClasses = [];
private static array $stack = [];
/**
* @param ReflectionClass $class
* @param object $object
* @param array $data
* @param bool $update
* @return mixed
* @throws Exception
*/
protected static function fillObject(ReflectionClass $class, object $object, array $data, bool $update = false) : mixed {
try {
$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);
}
// Если тип свойства класс (valueObject)
elseif($property->hasType() && class_exists($property->getType()->getName())) {
if(is_object($value[$property->getName()])){
$object->{$property->getName()} = $value[$property->getName()];
}
elseif(isset($value[$property->getName()])){
$object->{$property->getName()} = new ($property->getType()->getName())($value[$property->getName()]);
}
// Значения нет и VO может быть без параметров
elseif(self::isEmptyAvailable($property->getType()->getName())) {
$object->{$property->getName()} = new ($property->getType()->getName())();
}
}
// Базовые типы при наличии значения
elseif(array_key_exists($property->getName(), $value)){
if(!$property->hasType()){
$object->{$property->getName()} = $value[$property->getName()];
}
elseif(in_array($property->getType()->getName(), ['float', 'int'])){
if(is_numeric($value[$property->getName()])) $object->{$property->getName()} = $value[$property->getName()];
}
elseif($property->getType()->getName() == 'bool'){
$object->{$property->getName()} = (bool)$value[$property->getName()];
}
elseif(isset($value[$property->getName()])){
$object->{$property->getName()} = $value[$property->getName()];
}
}
}
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)]['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;
}
}

View File

@@ -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 ?? "";
}
/**
* @param string $name
* @return bool
*/
public function __isset(string $name): bool {
return isset($this->$name);
}
}

View File

@@ -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;
}

View File

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

View File

@@ -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;
}
}

View File

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

View File

@@ -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;
}

View File

@@ -3,7 +3,7 @@
namespace Rmphp\Storage\Mysql; namespace Rmphp\Storage\Mysql;
class MysqlStorageData { class MysqlResultData {
private ?\mysqli_result $result; private ?\mysqli_result $result;
private array $arrayData = []; private array $arrayData = [];
@@ -75,4 +75,4 @@ class MysqlStorageData {
if($this->result) $this->result->close(); if($this->result) $this->result->close();
} }
} }

View File

@@ -15,17 +15,24 @@ class MysqlStorage implements MysqlStorageInterface {
/** /**
* Внутренний конструктор подключения к БД * Внутренний конструктор подключения к БД
* Mysql constructor. * Mysql constructor.
* @param array $params * @param object $params
* @throws Exception * @throws Exception
*/ */
public function __construct(array $params) { public function __construct(
$this->mysqli = new mysqli($params['host'], $params['user'], $params['pass'], $params['base']); private readonly object $params
) {
$this->mysqli = new mysqli(
$this->params->host,
$this->params->user,
$this->params->pass,
$this->params->base
);
// выводим ошибку при неудачном подключении // выводим ошибку при неудачном подключении
if ($this->mysqli->connect_errno) { if ($this->mysqli->connect_errno) {
throw new Exception($this->mysqli->connect_errno); throw new Exception($this->mysqli->connect_errno);
} }
$this->mysqli->set_charset("utf8"); $this->mysqli->set_charset("utf8");
if(!empty($params['logsEnable'])) $this->logsEnabled = true; if(!empty($this->params->logsEnable)) $this->logsEnabled = true;
} }
/** @inheritDoc */ /** @inheritDoc */
@@ -111,7 +118,7 @@ class MysqlStorage implements MysqlStorageInterface {
/** @inheritDoc */ /** @inheritDoc */
public function find(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): bool|MysqlResultData {
if ($ln > 1) { if ($ln > 1) {
$cnts = (!empty($count)) ? $count : $this->query($sql)->num_rows; $cnts = (!empty($count)) ? $count : $this->query($sql)->num_rows;
@@ -126,18 +133,17 @@ class MysqlStorage implements MysqlStorageInterface {
$result = $this->query($sql.$limit); $result = $this->query($sql.$limit);
if (!$result || $result->num_rows == 0) return false; if (!$result || $result->num_rows == 0) return false;
$data = new MysqlStorageData($result); $data = new MysqlResultData($result);
$data->count = $cnts ?? 0; $data->count = $cnts ?? 0;
$data->hex = md5($sql); $data->hex = md5($sql);
return $data; return $data;
} }
/** @inheritDoc */ /** @inheritDoc */
public function findOne(string $sql) : bool|array { public function findOne(string $sql) : bool|MysqlResultData {
$result = $this->query($sql." limit 0, 1"); $result = $this->query($sql." limit 0, 1");
if (!$result || $result->num_rows == 0) return false; if (!$result || $result->num_rows == 0) return false;
$data = new MysqlStorageData($result); return new MysqlResultData($result);
return $data->fetchOne();
} }
/** @inheritDoc */ /** @inheritDoc */
@@ -145,7 +151,7 @@ class MysqlStorage implements MysqlStorageInterface {
$id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id); $id = (is_numeric($id)) ? (int) $id : $this->escapeStr($id);
$result = $this->query("select * from ".$this->escapeStr($table)." where `$name`='$id' limit 0, 1"); $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 false;
$data = new MysqlStorageData($result); $data = new MysqlResultData($result);
return $data->fetchOne(); return $data->fetchOne();
} }
@@ -205,4 +211,4 @@ class MysqlStorage implements MysqlStorageInterface {
return $out ?? []; return $out ?? [];
} }
} }

View File

@@ -80,15 +80,15 @@ interface MysqlStorageInterface {
* @param int $ln * @param int $ln
* @param int $numPage * @param int $numPage
* @param int $count * @param int $count
* @return bool|MysqlStorageData * @return bool|MysqlResultData
*/ */
public function find(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) : bool|MysqlResultData;
/** /**
* @param string $sql * @param string $sql
* @return bool|array * @return bool|array
*/ */
public function findOne(string $sql) : bool|array; public function findOne(string $sql) : bool|MysqlResultData;
/** /**
* @param string $table * @param string $table
@@ -127,4 +127,4 @@ interface MysqlStorageInterface {
* @return string * @return string
*/ */
public function getLastLog() : string; public function getLastLog() : string;
} }

View File

@@ -0,0 +1,90 @@
<?php
namespace Rmphp\Storage\Repository;
use Exception;
use ReflectionClass;
use ReflectionException;
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);
$fieldValue = [];
foreach(self::$classes[$class]->getProperties() as $property){
if(!$property->isInitialized($object) || 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){
$value = $property->getValue($object)->getValue();
if(isset($value)) $fieldValue[$property->getName()] = $value;
}
elseif(is_bool($property->getValue($object))){
$fieldValue[$property->getName()] = (int) $property->getValue($object);
}
else {
$fieldValue[$property->getName()] = $property->getValue($object);
}
if(array_key_exists($property->getName(), $fieldValue) && false !== $fieldValue[$property->getName()]) {
$out[strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()))] = $fieldValue[$property->getName()];
}
}
return (isset($method)) ? array_map($method, $out ?? []) : $out ?? [];
}
catch (ReflectionException $exception) {
throw new RepositoryException($exception->getMessage());
}
}
/** @inheritDoc */
public function createFromData(string $class, array|object $data) : 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);
}
catch (Exception $exception) {
throw new RepositoryException($exception->getMessage());
}
}
/** @inheritDoc */
public function updateFromData(object $object, array|object $data) : 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);
}
catch (Exception $exception) {
throw new RepositoryException($exception->getMessage());
}
}
/**
* @return array
*/
public function getRepositoryStack() : array {
return $this->getFillObjectStack();
}
/**
* @return array
*/
public function getClassesCash() : array {
return self::$classes;
}
}

View File

@@ -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
* @return mixed
* @throws RepositoryException
*/
public function createFromData(string $class, array|object $data) : mixed;
/**
* @param object $object
* @param array|object $data
* @return mixed
* @throws RepositoryException
*/
public function updateFromData(object $object, array|object $data) : mixed;
/**
* @return array
*/
public function getRepositoryStack() : array;
}