rinsvent/dto2data
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Рефакторинг

Browse Source 
починил тесты
This commit is contained in:
Rinsvent 2021-08-24 23:21:40 +07:00
parent db0e7c0910
commit 5d35178bdf
3 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Attribute/Schema.php
View File

@ -2,16 +2,16 @@
namespace Rinsvent\DTO2Data\Attribute;
use Rinsvent\DTO2Data\DTO\Map;
#[\Attribute(\Attribute::TARGET_ALL|\Attribute::IS_REPEATABLE)]
class Schema
{
public ?array $baseMap = null;
public function __construct(
public ?array $map = null,
/** @var string[] $tags */
public array $tags = ['default']
) {
$this->map = $map ?? $this->map;
$this->map = $map ?? $this->baseMap;
}
}

59
src/Dto2DataConverter.php
View File

@ -36,16 +36,12 @@ class Dto2DataConverter
foreach ($map as $key => $propertyInfo) {
$sourceName = is_array($propertyInfo) ? $key : $propertyInfo;
if (method_exists($object, $sourceName)) {
$reflectionSource = new ReflectionMethod($object, $sourceName);
$value = $this->getMethodValue($object, $reflectionSource);
} elseif (property_exists($object, $sourceName)) {
$reflectionSource = new ReflectionProperty($object, $sourceName);
$value = $this->getValue($object, $reflectionSource);
} else {
if (!method_exists($object, $sourceName) && !property_exists($object, $sourceName)) {
continue;
}
$value = $this->grabValue($object, $sourceName);
if (is_object($value)) {
// Если у объекта нет карты, то не сериализуем.
if (!is_array($propertyInfo)) {
@ -67,19 +63,12 @@ class Dto2DataConverter
}
}
$value = $tempValue;
} elseif (!is_scalar($value)) {
} elseif (!is_scalar($value) && null !== $value) {
continue;
}
if (method_exists($object, $sourceName)) {
$this->processMethodTransformers($reflectionSource, $value, $tags);
$dataPath = $this->grabMethodDataPath($reflectionSource, $tags);
} else {
$this->processTransformers($reflectionSource, $value, $tags);
$dataPath = $this->grabDataPath($reflectionSource, $tags);
}
$dataPath = $dataPath ?? $sourceName;
$this->processIterationTransformers($object, $sourceName, $value, $tags);
$dataPath = $this->grabIterationDataPath($object, $sourceName, $tags);
$data[$dataPath] = $value;
}
@ -88,6 +77,42 @@ class Dto2DataConverter
return $data;
}
protected function grabValue(object $object, $sourceName)
{
if (method_exists($object, $sourceName)) {
$reflectionSource = new ReflectionMethod($object, $sourceName);
return $this->getMethodValue($object, $reflectionSource);
} elseif (property_exists($object, $sourceName)) {
$reflectionSource = new ReflectionProperty($object, $sourceName);
return $this->getValue($object, $reflectionSource);
}
return null;
}
public function processIterationTransformers(object $object, string $sourceName, &$value, array $tags): void
{
if (method_exists($object, $sourceName)) {
$reflectionSource = new ReflectionMethod($object, $sourceName);
$this->processMethodTransformers($reflectionSource, $value, $tags);
} elseif (property_exists($object, $sourceName)) {
$reflectionSource = new ReflectionProperty($object, $sourceName);
$this->processTransformers($reflectionSource, $value, $tags);
}
}
public function grabIterationDataPath(object $object, string $sourceName, array $tags): string
{
if (method_exists($object, $sourceName)) {
$reflectionSource = new ReflectionMethod($object, $sourceName);
$dataPath = $this->grabMethodDataPath($reflectionSource, $tags);
} elseif (property_exists($object, $sourceName)) {
$reflectionSource = new ReflectionProperty($object, $sourceName);
$dataPath = $this->grabDataPath($reflectionSource, $tags);
}
return $dataPath ?? $sourceName;
}
/**
* Получаем теги для обработки
*/

3
tests/unit/Converter/fixtures/FillTest/HelloSchema.php
View File

@ -3,12 +3,11 @@
namespace Rinsvent\DTO2Data\Tests\unit\Converter\fixtures\FillTest;
use Rinsvent\DTO2Data\Attribute\Schema;
use Rinsvent\DTO2Data\DTO\Map;
#[\Attribute(\Attribute::TARGET_ALL|\Attribute::IS_REPEATABLE)]
class HelloSchema extends Schema
{
public ?array $map = [
public ?array $baseMap = [
'surname',
'age',
'emails',