Property::setValue() automatically turns on initialized state [Closes #71]

Author: dg

src/PhpGenerator/ClassType.php

@@ -434,7 +434,9 @@ public function getProperty(string $name): Property
 	 */
 	public function addProperty(string $name, $value = null): Property
 	{
-		return $this->properties[$name] = (new Property($name))->setValue($value);
+		return $this->properties[$name] = func_num_args() > 1
+			? (new Property($name))->setValue($value)
+			: new Property($name);
 	}
 
 

src/PhpGenerator/Factory.php

@@ -200,6 +200,8 @@ public function fromPropertyReflection(\ReflectionProperty $from): Property
 				$prop->setType((string) $from->getType());
 			}
 			$prop->setInitialized($from->hasType() && array_key_exists($prop->getName(), $defaults));
+		} else {
+			$prop->setInitialized(false);
 		}
 		$prop->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));
 		$prop->setAttributes(self::getAttributes($from));

src/PhpGenerator/Property.php

@@ -45,6 +45,7 @@ final class Property
 	public function setValue($val): self
 	{
 		$this->value = $val;
+		$this->initialized = true;
 		return $this;
 	}
 
@@ -107,6 +108,6 @@ public function setInitialized(bool $state = true): self
 
 	public function isInitialized(): bool
 	{
-		return $this->initialized;
+		return $this->initialized || $this->value !== null;
 	}
 }

tests/PhpGenerator/ClassType.phpt

@@ -65,6 +65,10 @@ $class->addProperty('typed2')
 	->setNullable()
 	->setInitialized();
 
+$class->addProperty('typed3')
+	->setType(Type::ARRAY)
+	->setValue(null);
+
 $p = $class->addProperty('sections', ['first' => true])
 	->setStatic(true);
 
@@ -141,7 +145,7 @@ $class->setMethods(array_values($methods));
 Assert::same($methods, $class->getMethods());
 
 $properties = $class->getProperties();
-Assert::count(5, $properties);
+Assert::count(6, $properties);
 $class->setProperties(array_values($properties));
 Assert::same($properties, $class->getProperties());
 

tests/PhpGenerator/expected/ClassType.expect

@@ -22,6 +22,7 @@ abstract class Example extends ParentClass implements IExample, IOne
 	public $order = RecursiveIteratorIterator::SELF_FIRST;
 	public array $typed1;
 	public ?array $typed2 = null;
+	public array $typed3 = null;
 	public static $sections = ['first' => true];