maintenance: tidy up merges (#15)

Author: Greg Bowler

composer.lock

@@ -11,13 +11,13 @@ public function fromObject(
 
 		foreach($input as $key => $value) {
 			if(is_object($value)) {
-				$value = $this->fromObject($value);
+				$value = $this->fromObject($value, $dataObjectClass);
 			}
 			elseif(is_array($value)) {
 				if(is_int(key($value))) {
-					array_walk($value, function(&$element) {
+					array_walk($value, function(&$element)use($dataObjectClass) {
 						if(is_object($element)) {
-							$element = $this->fromObject($element);
+							$element = $this->fromObject($element, $dataObjectClass);
 						}
 					});
 				}
@@ -59,4 +59,4 @@ public function fromAssociativeArray(array $input):DataObject {
 
 		return $dataObject;
 	}
-}
+}

src/DataObjectBuilder.php

@@ -4,6 +4,7 @@
 use Gt\DataObject\AssociativeArrayWithinObjectException;
 use Gt\DataObject\DataObjectBuilder;
 use Gt\DataObject\ObjectWithinAssociativeArrayException;
+use Gt\DataObject\Test\Helper\CustomDataObject;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
@@ -39,7 +40,7 @@ public function testFromObjectNested() {
 		self::assertEquals("value4", $nestedOutput->getString("key4"));
 	}
 
-	public function fromObjectNestedWithCustomClass() {
+	public function testFromObjectNestedWithCustomClass() {
 		$obj = new StdClass();
 		$obj->key1 = "value1";
 		$obj->key2 = "value2";
@@ -48,17 +49,14 @@ public function fromObjectNestedWithCustomClass() {
 		$obj->nested->key3 = "value3";
 		$obj->nested->key4 = "value4";
 
-		$myClass = new class extends StdClass {
-		};
-
 		$sut = new DataObjectBuilder();
-		$output = $sut->fromObject($obj, $myClass);
+		$output = $sut->fromObject($obj, CustomDataObject::class);
 
 		$nestedOutput = $output->get("nested");
 		$deepNestedOutput = $nestedOutput->getObject("deepNested");
 		self::assertIsObject($nestedOutput);
-		self::assertInstanceOf($myClass, $nestedOutput);
-		self::assertInstanceOf($myClass, $deepNestedOutput);
+		self::assertInstanceOf(CustomDataObject::class, $nestedOutput);
+		self::assertInstanceOf(CustomDataObject::class, $deepNestedOutput);
 	}
 
 	public function testFromObjectNestedArray() {

test/phpunit/DataObjectBuilderTest.php

@@ -0,0 +1,7 @@
+<?php
+namespace Gt\DataObject\Test\Helper;
+
+use Gt\DataObject\DataObject;
+
+class CustomDataObject extends DataObject {
+}