Merge pull request #80 from WendellAdriel/hotfix/to-array

Fix issue with toArray
WendellAdriel · Jul 15, 2024 · 93721ce · 93721ce
2 parents 7a33667 + 0fb4ac3
commit 93721ce
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/SimpleDTO.php b/src/SimpleDTO.php
@@ -401,6 +401,10 @@ private function mapDTOData(array $mapping, array $data): array
                 ? $mapping[$key]
                 : $key;
 
+            if (isset($this->{$key}) && $value !== $this->{$key}) {
+                $value = $this->{$key};
+            }
+
             $mappedData[$property] = $this->isArrayable($value)
                 ? $this->formatArrayableValue($value)
                 : $value;

diff --git a/tests/Unit/SimpleDTOTest.php b/tests/Unit/SimpleDTOTest.php
@@ -8,6 +8,7 @@
 use Illuminate\Http\Request;
 use WendellAdriel\ValidatedDTO\Exceptions\InvalidJsonException;
 use WendellAdriel\ValidatedDTO\SimpleDTO;
+use WendellAdriel\ValidatedDTO\Tests\Datasets\AttributesDTO;
 use WendellAdriel\ValidatedDTO\Tests\Datasets\CallableCastingDTOInstance;
 use WendellAdriel\ValidatedDTO\Tests\Datasets\SimpleDTOInstance;
 use WendellAdriel\ValidatedDTO\Tests\Datasets\SimpleMapBeforeExportDTO;
@@ -301,3 +302,15 @@ public function __invoke() {}
         ->and($dto->age)
         ->toBe(30);
 });
+
+it('checks that update for property reflects while converting DTO', function () {
+    $dto = AttributesDTO::fromArray([
+        'age' => 18,
+        'doc' => 'test',
+    ]);
+
+    $dto->age = 20;
+
+    expect($dto->age)->toBe(20)
+        ->and($dto->toArray())->toBe(['age' => 20, 'doc' => 'test']);
+});