root element

Author: František Mazura

src/AbstractValueObject.php

@@ -66,9 +66,6 @@ public function init($data): self
 		foreach ($data as $name => $item) {
 			$setter = "set" . ucfirst($name);
 			$value = $data[$name] ?? null;
-			if ($name == self::ROOT) {
-				$value = $data;
-			}
 			$this->setTouched($name);
 			try {
 				if (method_exists($this, $setter)) {
@@ -110,6 +107,11 @@ public function toArray(): array
 			if ($this->isIgnoredAttr($name)) {
 				continue;
 			}
+			// if ROOT do not print inside root attribute
+			if ($name == self::ROOT && $item instanceof ValueObjectInterface) {
+				$out = $item->toArray();
+				break;
+			}
 			// ValueObject element
 			if ($item instanceof AbstractValueObject) {
 				$out[$name] = $item->toArray();
@@ -219,7 +221,7 @@ private static function transformBuildInType(ReflectionParameter $reflectionPara
 	private static function initAndValidateValueObject(object $obj, string $setter, ReflectionParameter $parameter, $data)
 	{
 		$type = $parameter->getType()->getName();
-		if (is_subclass_of($type, AbstractValueObject::class)) {
+		if (is_subclass_of($type, ValueObjectInterface::class)) {
 			if (empty($data) && !is_array($data)) {
 				if ($parameter->allowsNull()) {
 					return;

tests/ValueObjectTest.php

@@ -6,7 +6,7 @@
 use OGSoft\ValueObjects\Exceptions\ValidatorException;
 use PHPUnit\Framework\TestCase;
 use Tests\ValueObjects\CarValueObject;
-use Tests\ValueObjects\TireValueObject;
+use Tests\ValueObjects\RootValueObject;
 
 final class ValueObjectTest extends TestCase
 {
@@ -70,8 +70,8 @@ public function testRoot()
 	{
 		$data = ["winter" => true];
 
-		$tire = new TireValueObject();
-		$tire->init($data);
+		$tire = new RootValueObject();
+		$tire->init(["root" => $data]);
 		$this->assertEquals($data, $tire->toArray());
 	}
 }

tests/ValueObjects/RootValueObject.php

@@ -4,7 +4,7 @@
 namespace Tests\ValueObjects;
 
 
-class RootValueObject
+class RootValueObject extends AbstractMyValueObject
 {
 	/**
 	 * @var TireValueObject