tweak: nested empty arrays in objects

PhpGt · Jul 13, 2023 · 3b05cc3 · 3b05cc3
1 parent 53e355a
commit 3b05cc3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/DataObjectBuilder.php b/src/DataObjectBuilder.php
@@ -14,7 +14,10 @@ public function fromObject(
 				$value = $this->fromObject($value, $dataObjectClass);
 			}
 			elseif(is_array($value)) {
-				if(is_int(key($value))) {
+				if(empty($value)) {
+					$value = [];
+				}
+				elseif(is_int(key($value))) {
 					array_walk($value, function(&$element)use($dataObjectClass) {
 						if(is_object($element)) {
 							$element = $this->fromObject($element, $dataObjectClass);

diff --git a/test/phpunit/DataObjectBuilderTest.php b/test/phpunit/DataObjectBuilderTest.php
@@ -193,4 +193,17 @@ public function testEmptyNestedArray():void {
 		self::assertSame("value2", $output->getString("key2"));
 		self::assertSame([], $output->getArray("nested"));
 	}
+
+	public function testEmptyNestedArrayInObject():void {
+		$object = (object)[
+			"key1" => "value1",
+			"key2" => "value2",
+			"nested" => [],
+		];
+		$sut = new DataObjectBuilder();
+		$output = $sut->fromObject($object);
+
+		self::assertSame("value2", $output->getString("key2"));
+		self::assertSame([], $output->getArray("nested"));
+	}
 }