From 7f5e04539a8d56a36c5cbb0ba249e257fa5b9cdb Mon Sep 17 00:00:00 2001
From: Sipachev Igor <sipachev@sveak.com>
Date: Thu, 26 Aug 2021 13:09:25 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=B0=20=D0=9D=D1=83=D0=B6=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=83=D0=BC=D0=B0=D1=82=D1=8C=20=D0=BE=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5=D1=88=D0=BD=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D0=BC=20=D0=BC=D0=B0=D1=81?=
 =?UTF-8?q?=D1=81=D0=B8=D0=B2=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Dto2DataConverter.php         | 8 +++++---
 tests/unit/Converter/FillTest.php | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Dto2DataConverter.php b/src/Dto2DataConverter.php
index 8071b4a..82ddd55 100644
--- a/src/Dto2DataConverter.php
+++ b/src/Dto2DataConverter.php
@@ -46,8 +46,8 @@ class Dto2DataConverter
             if (is_object($value) && is_array($propertyInfo)) {
                 $value = $this->convertObjectByMap($value, $propertyInfo, $tags);
             } elseif (is_iterable($value)) {
-                $map = is_array($propertyInfo) ? $propertyInfo : null;
-                $value = $this->convertArrayByMap($value, $map, $tags);
+                $childMap = is_array($propertyInfo) ? $propertyInfo : null;
+                $value = $this->convertArrayByMap($value, $childMap, $tags);
             } elseif (!is_scalar($value) && null !== $value) {
                 continue;
             }
@@ -64,6 +64,8 @@ class Dto2DataConverter
 
     public function convertArrayByMap($data, ?array $map, array $tags = []): ?array
     {
+        $isAssociative = count($data) && !array_key_exists(0, $data);
+
         $tempValue = [];
         foreach ($data as $key => $item) {
             if (is_scalar($item)) {
@@ -79,7 +81,7 @@ class Dto2DataConverter
                 continue;
             }
         }
-        return $tempValue ?: null;
+        return $tempValue;
     }
 
     protected function grabValue(object $object, $sourceName)
diff --git a/tests/unit/Converter/FillTest.php b/tests/unit/Converter/FillTest.php
index 531a173..2ec7964 100644
--- a/tests/unit/Converter/FillTest.php
+++ b/tests/unit/Converter/FillTest.php
@@ -95,7 +95,7 @@ class FillTest extends \Codeception\Test\Unit
                     "name" => "Sapkovsky"
                 ]
             ],
-            "authors3" => null,
+            "authors3" => [],
             "buy" => [
                 "phrase" => "Buy buy!!!",
                 "length" => 10,