From 77c0c14c1435b6dd59077d7a7c5d1e1ae37afff4 Mon Sep 17 00:00:00 2001
From: Rinsvent <rinsvent007@gmail.com>
Date: Sun, 29 Aug 2021 16:51:34 +0700
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA=20=D1=87=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=8B=20=D0=B8=D1=82=D0=B5=D1=80=D0=B8=D1=80=D1=83=D0=B5?=
 =?UTF-8?q?=D0=BC=D1=8B=D0=B5=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D1=8B?=
 =?UTF-8?q?=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=B0=D1=82=D1=8B=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=81=D1=8C=20=D0=B2=20=D0=BF=D0=B5=D1=80=D0=B2?=
 =?UTF-8?q?=D1=83=D1=8E=20=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Dto2DataConverter.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Dto2DataConverter.php b/src/Dto2DataConverter.php
index 42e166b..67d41f0 100644
--- a/src/Dto2DataConverter.php
+++ b/src/Dto2DataConverter.php
@@ -44,11 +44,11 @@ class Dto2DataConverter
             $value = $this->grabValue($object, $sourceName, $tags);
 
             // Если нет карты, то не сериализуем.
-            if (is_object($value) && is_array($propertyInfo)) {
-                $value = $this->convertObjectByMap($value, $propertyInfo, $tags);
-            } elseif (is_iterable($value)) {
+            if (is_iterable($value)) {
                 $childMap = is_array($propertyInfo) ? $propertyInfo : null;
                 $value = $this->convertArrayByMap($value, $childMap, $tags);
+            } elseif (is_object($value) && is_array($propertyInfo)) {
+                $value = $this->convertObjectByMap($value, $propertyInfo, $tags);
             } elseif (!is_scalar($value) && null !== $value) {
                 continue;
             }