Fix array castings for nested objects

Author: hakobyansen

src/DtoSerialize.php

@@ -38,9 +38,18 @@ public static function serializeSingle( Dto $dto ): \stdClass
 	/**
 	 * @param Dto $dto
 	 * @param array $arr
+	 * @param bool $toSnakeCase
+	 * @param bool $includeNulls
+	 * @param string $keyPrefix
 	 * @return array
 	 */
-	public static function castToArray( Dto $dto, array $arr = [] ): array
+	public static function castToArray(
+		Dto $dto,
+		array $arr = [],
+		bool $toSnakeCase = false,
+		bool $includeNulls = false,
+		string $keyPrefix = ''
+	): array
 	{
 		$vars = $dto->getObjectVars();
 
@@ -49,9 +58,21 @@ public static function castToArray( Dto $dto, array $arr = [] ): array
 			$key = str_replace('_', '', $key);
 			$temp = [];
 
+			$key = $toSnakeCase ?
+				ltrim(strtolower(preg_replace('/[A-Z]([A-Z](?![a-z]))*/', '_$0', $key)), '_') :
+				lcfirst($key);
+
+			$key = "{$keyPrefix}{$key}";
+
 			if($value instanceof Dto)
 			{
-				$temp = self::castToArray($value, $temp);
+				$temp = self::castToArray(
+					dto: $value,
+					arr: $temp,
+					toSnakeCase: $toSnakeCase,
+					includeNulls: $includeNulls,
+					keyPrefix: $keyPrefix,
+				);
 				$arr[$key] = $temp;
 			}
 			else

src/ToArray.php

@@ -18,24 +18,11 @@ public function toArray(
 		string $keyPrefix = ''
 	): array
 	{
-		$arr = self::castToArray($this);
-
-		$result = [];
-
-		foreach ($arr as $key => $value)
-		{
-			$key = $toSnakeCase ?
-				ltrim(strtolower(preg_replace('/[A-Z]([A-Z](?![a-z]))*/', '_$0', $key)), '_') :
-				lcfirst($key);
-
-			$key = "{$keyPrefix}{$key}";
-
-			if($value !== null || $includeNulls)
-			{
-				$result[$key] = $value;
-			}
-		}
-
-		return $result;
+		return self::castToArray(
+			dto: $this,
+			toSnakeCase: $toSnakeCase,
+			includeNulls: $includeNulls,
+			keyPrefix: $keyPrefix
+		);
 	}
 }

tests/Unit/DtoTest.php

@@ -4,6 +4,7 @@
 
 use Tests\Unit\Mock\MockDto;
 use PHPUnit\Framework\TestCase;
+use Tests\Unit\Mock\MockSubDto;
 
 class DtoTest extends TestCase
 {
@@ -16,7 +17,15 @@ protected function setUp(): void
 		$this->_mockData = [
 			'name' => 'Mock name',
 			'count' => 4,
-			'is_true' => true
+			'is_true' => true,
+			'sub_dto' => new MockSubDto([
+				'sub_name' => 'Mock sub name',
+				'sub_count' => 5,
+				'sub_sub_dto' => [
+					'sub_name' => 'Mock sub sub name',
+					'sub_count' => 6,
+				]
+			]),
 		];
 	}
 
@@ -95,5 +104,13 @@ public function testToArray()
 		$this->assertEquals( $this->_mockData['name'], $arr["{$keyPrefix}name"] );
 		$this->assertEquals( $this->_mockData['count'], $arr["{$keyPrefix}count"] );
 		$this->assertEquals( $this->_mockData['is_true'], $arr["{$keyPrefix}is_true"] );
+
+		$arr = $dto->toArray();
+
+		$this->assertEquals( $this->_mockData['sub_dto']->getSubName(), $arr['sub_dto']['sub_name'] );
+		$this->assertEquals( $this->_mockData['sub_dto']->getSubCount(), $arr['sub_dto']['sub_count'] );
+
+		$this->assertEquals( $this->_mockData['sub_dto']->getSubSubDto()->getSubName(), $arr['sub_dto']['sub_sub_dto']['sub_name'] );
+		$this->assertEquals( $this->_mockData['sub_dto']->getSubSubDto()->getSubCount(), $arr['sub_dto']['sub_sub_dto']['sub_count'] );
 	}
 }

tests/Unit/Mock/MockDto.php

@@ -10,14 +10,19 @@ class MockDto extends Dto
 	use ToArray;
 
 	private ?string $_name;
+
 	private int $_count;
+
 	private bool $_isTrue;
 
+	private ?MockSubDto $_subDTO;
+
 	public function __construct( array $data )
 	{
 		$this->_name   = $data['name'];
 		$this->_count  = $data['count'];
 		$this->_isTrue = $data['is_true'];
+		$this->_subDTO = $data['sub_dto'] ?? null;
 	}
 
 	/**
@@ -43,4 +48,12 @@ public function getIsTrue(): bool
 	{
 		return $this->_isTrue;
 	}
+
+	/**
+	 * @return MockSubDto|null
+	 */
+	public function getSubDTO(): ?MockSubDto
+	{
+		return $this->_subDTO;
+	}
 }

tests/Unit/Mock/MockSubDto.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Tests\Unit\Mock;
+
+use PhpDto\Dto;
+use PhpDto\ToArray;
+
+class MockSubDto extends Dto
+{
+	use ToArray;
+
+	private ?string $_subName;
+
+	private int $_subCount;
+
+	private ?self $_subSubDto;
+
+	public function __construct( array $data )
+	{
+		$this->_subName  = $data['sub_name'];
+		$this->_subCount = $data['sub_count'];
+
+		if(isset($data['sub_sub_dto']))
+		{
+			$this->_subSubDto = new self($data['sub_sub_dto']);
+		}
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getSubName(): ?string
+	{
+		return $this->_subName;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getSubCount(): int
+	{
+		return $this->_subCount;
+	}
+
+	/**
+	 * @return self|null
+	 */
+	public function getSubSubDto(): ?self
+	{
+		return $this->_subSubDto;
+	}
+}