From e3290afe79b8f247607c5484001a969ea57523a1 Mon Sep 17 00:00:00 2001 From: Rinsvent Date: Sat, 6 Nov 2021 15:23:04 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D0=B0?= =?UTF-8?q?=D1=82=D0=BB=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=8A=D0=B5=D0=BA=D1=82=20=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=B1=D1=8B=D0=BB=D0=BE=20=D1=81=D0=B5=D1=80=D0=B8=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D1=81=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=BA=D1=83=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=20=D1=82=D1=80=D0=B0=D0=BD=D1=81=D1=84=D0=BE=D1=80=D0=BC=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Dto2DataConverter.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Dto2DataConverter.php b/src/Dto2DataConverter.php index 1f2ff2e..2afc1ca 100644 --- a/src/Dto2DataConverter.php +++ b/src/Dto2DataConverter.php @@ -65,6 +65,7 @@ class Dto2DataConverter $value = $this->grabValue($object, $sourceName, $tags); + $canSkip = false; // Если нет карты, то не сериализуем. if (is_iterable($value)) { $childMap = is_array($propertyInfo) ? $propertyInfo : null; @@ -72,10 +73,15 @@ class Dto2DataConverter } elseif (is_object($value) && is_array($propertyInfo)) { $value = $this->convertObjectByMap($value, $propertyInfo, $tags); } elseif (!is_scalar($value) && null !== $value) { - continue; + $canSkip = true; } $this->processIterationTransformers($object, $sourceName, $value, $tags); + + if ($canSkip && !is_scalar($value) && null !== $value) { + continue; + } + $dataPath = $this->grabIterationDataPath($object, $sourceName, $tags); $data[$dataPath] = $value; }