From 3f403ba077c8d020305a0beecb619a826e22ecf8 Mon Sep 17 00:00:00 2001
From: Rinsvent <rinsvent007@gmail.com>
Date: Sun, 8 Aug 2021 14:01:51 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B8=D0=BD=D1=82=D0=B5?=
 =?UTF-8?q?=D0=B3=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83=20=D0=BC=D0=B0=D1=81?=
 =?UTF-8?q?=D1=81=D0=B8=D0=B2=D0=BE=D0=B2=20=D0=94=D0=A2=D0=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Attribute/DTOMeta.php                     | 11 ++++++++++
 src/Data2DtoConverter.php                     | 22 +++++++++++++++++++
 tests/unit/Converter/FillTest.php             | 12 ++++++++++
 .../Converter/fixtures/FillTest/Author.php    |  8 +++++++
 .../fixtures/FillTest/HelloRequest.php        |  3 +++
 5 files changed, 56 insertions(+)
 create mode 100644 src/Attribute/DTOMeta.php
 create mode 100644 tests/unit/Converter/fixtures/FillTest/Author.php

diff --git a/src/Attribute/DTOMeta.php b/src/Attribute/DTOMeta.php
new file mode 100644
index 0000000..33e2ae7
--- /dev/null
+++ b/src/Attribute/DTOMeta.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Rinsvent\Data2DTO\Attribute;
+
+#[\Attribute]
+class DTOMeta
+{
+    public function __construct(
+        public string $class
+    ) {}
+}
\ No newline at end of file
diff --git a/src/Data2DtoConverter.php b/src/Data2DtoConverter.php
index 989632a..af0c7be 100644
--- a/src/Data2DtoConverter.php
+++ b/src/Data2DtoConverter.php
@@ -3,6 +3,7 @@
 namespace Rinsvent\Data2DTO;
 
 use Rinsvent\AttributeExtractor\PropertyExtractor;
+use Rinsvent\Data2DTO\Attribute\DTOMeta;
 use Rinsvent\Data2DTO\Attribute\PropertyPath;
 use Rinsvent\Data2DTO\Resolver\TransformerResolverStorage;
 use Rinsvent\Data2DTO\Transformer\Meta;
@@ -37,6 +38,27 @@ class Data2DtoConverter
                     $property->setValue($object, $value);
                     continue;
                 }
+                $attributedPropertyClass = null;
+                $propertyName = $property->getName();
+                $propertyExtractor = new PropertyExtractor($property->class, $propertyName);
+                /** @var DTOMeta $dtoMeta */
+                if ($dtoMeta = $propertyExtractor->fetch(DTOMeta::class)) {
+                    $attributedPropertyClass = $dtoMeta->class;
+                }
+
+                // Если массив и есть атрибут с указанием класса, то также преобразуем структуру
+                if ($propertyType === 'array' && $attributedPropertyClass) {
+                    // Если тип у ДТО - массив, а в значении не массив - пропустим
+                    if (!is_array($value)) {
+                        continue;
+                    }
+                    $tempValue = [];
+                    foreach ($value as $itemValue) {
+                        $tempValue[] = $this->convert($itemValue, $attributedPropertyClass);
+                    }
+                    $value = $tempValue;
+                }
+
                 // Если это class, то рекурсивно заполняем дальше
                 if (class_exists($propertyType)) {
                     $value = $this->convert($value, $propertyType);
diff --git a/tests/unit/Converter/FillTest.php b/tests/unit/Converter/FillTest.php
index a446cf3..e950a09 100644
--- a/tests/unit/Converter/FillTest.php
+++ b/tests/unit/Converter/FillTest.php
@@ -33,6 +33,14 @@ class FillTest extends \Codeception\Test\Unit
                 'af234f',
                 'asdf33333'
             ],
+            'authors' => [
+                [
+                    'name' => 'Tolkien',
+                ],
+                [
+                    'name' => 'Sapkovsky'
+                ]
+            ],
             'buy' => [
                 'phrase' => 'Buy buy!!!',
                 'length' => 10,
@@ -53,5 +61,9 @@ class FillTest extends \Codeception\Test\Unit
         $this->assertEquals('Buy buy!!!', $dto->buy->phrase);
         $this->assertEquals(10, $dto->buy->length);
         $this->assertEquals(true, $dto->buy->isFirst);
+
+        $this->assertCount(2, $dto->authors);
+        $this->assertEquals('Tolkien', $dto->authors[0]->name);
+        $this->assertEquals('Sapkovsky', $dto->authors[1]->name);
     }
 }
diff --git a/tests/unit/Converter/fixtures/FillTest/Author.php b/tests/unit/Converter/fixtures/FillTest/Author.php
new file mode 100644
index 0000000..ef071ac
--- /dev/null
+++ b/tests/unit/Converter/fixtures/FillTest/Author.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Rinsvent\Data2DTO\Tests\unit\Converter\fixtures\FillTest;
+
+class Author
+{
+    public string $name;
+}
diff --git a/tests/unit/Converter/fixtures/FillTest/HelloRequest.php b/tests/unit/Converter/fixtures/FillTest/HelloRequest.php
index 3544b43..36f2645 100644
--- a/tests/unit/Converter/fixtures/FillTest/HelloRequest.php
+++ b/tests/unit/Converter/fixtures/FillTest/HelloRequest.php
@@ -2,6 +2,7 @@
 
 namespace Rinsvent\Data2DTO\Tests\unit\Converter\fixtures\FillTest;
 
+use Rinsvent\Data2DTO\Attribute\DTOMeta;
 use Rinsvent\Data2DTO\Attribute\PropertyPath;
 use Rinsvent\Data2DTO\Transformer\Trim;
 
@@ -12,5 +13,7 @@ class HelloRequest
     #[PropertyPath('fake_age')]
     public int $age;
     public array $emails;
+    #[DTOMeta(class: Author::class)]
+    public array $authors;
     public BuyRequest $buy;
 }