2 Commits
10.x ... 11.0.1

Author SHA1 Message Date
User
35026bb223 20250530#1 2025-05-30 11:26:18 +03:00
User
e2727c34e8 20250510#1 2025-05-10 14:20:24 +03:00
4 changed files with 9 additions and 11 deletions

View File

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

View File

@@ -25,7 +25,7 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
/** @inheritDoc */
public function createFromResult(string $class, bool|MysqlResultData $result, callable $function = null): mixed {
public function createFromResult(string $class, ?MysqlResultData $result, callable $function = null): mixed {
if($result instanceof MysqlResultData) {
$val = (isset($function)) ? $function($result->fetchOne()) : $result->fetchOne();
$out = $this->createFromData($class, $val);
@@ -35,7 +35,7 @@ abstract class AbstractMysqlRepository extends AbstractRepository implements Mys
/** @inheritDoc */
public function createListFromResult(string $class, bool|MysqlResultData $result, callable $function = null): array {
public function createListFromResult(string $class, ?MysqlResultData $result, callable $function = null): array {
if($result instanceof MysqlResultData) {
foreach($result->fetch() as $resultValue) {
$val = (isset($function)) ? $function($resultValue) : $resultValue;

View File

@@ -59,7 +59,7 @@ abstract class AbstractDataObject {
// Если тип свойства класс (valueObject)
elseif($property->hasType() && class_exists($property->getType()->getName())) {
// значение объект
if(is_object($value[$property->getName()])){
if(isset($value[$property->getName()]) && is_object($value[$property->getName()])){
$object->{$property->getName()} = $value[$property->getName()];
$case[$property->getName()] = 'VO: Object';
}

View File

@@ -16,21 +16,19 @@ interface MysqlRepositoryInterface extends RepositoryInterface {
/**
* @param string $class
* @param bool|MysqlResultData $result
* @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