34 Commits
5.1 ... 12.0

Author SHA1 Message Date
User
7c71fdf49c 20250622#6 2025-06-22 13:43:47 +03:00
User
56d801cc54 20250622#4 2025-06-22 02:56:56 +03:00
User
d6d571cb1a 20250622#3 2025-06-22 02:49:36 +03:00
User
7e8dfe0678 20250622#2 2025-06-22 01:23:54 +03:00
User
f42bc7751a 20250622#1 2025-06-22 01:05:12 +03:00
User
35026bb223 20250530#1 2025-05-30 11:26:18 +03:00
User
e2727c34e8 20250510#1 2025-05-10 14:20:24 +03:00
User
e16700fe8d 20250509#1 2025-05-09 23:00:16 +03:00
User
335c4d240c 20250427#1 2025-04-27 01:31:26 +03:00
User
91af1ea14f 20250419#2 2025-04-19 18:46:40 +03:00
User
41523e6899 20250419#1 2025-04-19 18:45:41 +03:00
User
4a56e42af4 20250413#1 2025-04-13 12:45:30 +03:00
User
4b1c0d7044 20250330#8 2025-03-31 02:49:17 +03:00
User
d300a6b628 20250330#7 2025-03-31 02:48:18 +03:00
User
09e8520ded 20250330#6 2025-03-30 20:19:12 +03:00
User
e6fd18fa2f 20250330#5 2025-03-30 19:18:31 +03:00
User
9c1f6be326 20250330#4 2025-03-30 19:16:20 +03:00
User
f3458d1870 20250330#3 2025-03-30 18:35:21 +03:00
User
1ce2a09e01 20250330#2 2025-03-30 15:13:47 +03:00
User
fd996d40c8 20250330#1 2025-03-30 13:28:30 +03:00
User
96ee46476c 20250327#4 2025-03-27 03:44:20 +03:00
User
d8991dcef5 20250327#3 2025-03-27 03:13:36 +03:00
User
30a20d427b 20250327#2 2025-03-27 03:01:09 +03:00
User
10f6d62b43 20250327#1 2025-03-27 00:02:46 +03:00
User
2beff209de 20250326#3 2025-03-26 16:31:17 +03:00
User
a39c0a6bf1 20250326#2 2025-03-26 16:30:23 +03:00
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
12 changed files with 194 additions and 242 deletions

View File

@@ -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"
```

View File

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

View File

@@ -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 */
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); exit;}
/**
* @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
*/
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->mapper->createObjectFromData($class, $val);
}
return $out ?? null;
} catch(ODMException $odmException) {
throw new RepositoryException($odmException->getMessage(), $odmException->getCode());
}
}
/**
* @inheritDoc
*/
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->mapper->createObjectFromData($class, $val);
}
}
return $out ?? [];
} catch(ODMException $odmException) {
throw new RepositoryException($odmException->getMessage(), $odmException->getCode());
}
}
/**
* @inheritDoc
*/
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->mapper->createObjectFromData($this->getEntityClass(), $result);
return $out ?? null;
} catch(ODMException $odmException) {
throw new RepositoryException($odmException->getMessage(), $odmException->getCode());
}
}
/**
* @inheritDoc
*/
final public function saveEntity(EntityInterface $object, string $table = null) : mixed {
try {
if(!isset($table)) $table = $this->getTable();
$in = $this->mapper->getDataFromObject($object, function ($value){
return (is_string($value)) ? $this->mysql->escapeStr($value) : $value;
});
if($this->isDebug()) {$this->debug($object, $in, $table, ...$this->getDebugExtraData()); exit;}
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

View File

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

View File

@@ -8,29 +8,58 @@
namespace Rmphp\Storage\Mysql;
use Rmphp\Storage\Entity\EntityInterface;
use Rmphp\Storage\RepositoryException;
use Rmphp\Storage\RepositoryInterface;
use Rmphp\ODM\ObjectDataMapper;
use Rmphp\Storage\Repository\EntityInterface;
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

View File

@@ -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 */
@@ -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();
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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