added support for PHP 7.4 typed properties

Author: dg

readme.md

@@ -124,14 +124,19 @@ If the property, constant, method or parameter already exist, it will be overwri
 
 Members can be removed using `removeProperty()`, `removeConstant()`, `removeMethod()` or `removeParameter()`.
 
-PHP Generator supports all new PHP 7.3 features:
+PHP Generator supports all new PHP 7.3 and 7.4 features:
 
 ```php
 $class = new Nette\PhpGenerator\ClassType('Demo');
 
 $class->addConstant('ID', 123)
 	->setVisibility('private'); // constant visiblity
 
+$class->addProperty('items')
+	->setType('array') // typed properites
+	->setNullable()
+	->setInitialized();
+
 $method = $class->addMethod('getValue')
 	->setReturnType('int') // method return type
 	->setReturnNullable() // nullable return type
@@ -151,6 +156,8 @@ class Demo
 {
 	private const ID = 123;
 
+	public ?array $items = null;
+
 	public function getValue(?int $id): ?int
 	{
 		return count($this->items);

src/PhpGenerator/Factory.php

@@ -121,13 +121,19 @@ public function fromParameterReflection(\ReflectionParameter $from): Parameter
 
 	public function fromPropertyReflection(\ReflectionProperty $from): Property
 	{
+		$defaults = $from->getDeclaringClass()->getDefaultProperties();
 		$prop = new Property($from->getName());
-		$prop->setValue($from->getDeclaringClass()->getDefaultProperties()[$prop->getName()] ?? null);
+		$prop->setValue($defaults[$prop->getName()] ?? null);
 		$prop->setStatic($from->isStatic());
 		$prop->setVisibility($from->isPrivate()
 			? ClassType::VISIBILITY_PRIVATE
 			: ($from->isProtected() ? ClassType::VISIBILITY_PROTECTED : ClassType::VISIBILITY_PUBLIC)
 		);
+		if (PHP_VERSION_ID >= 70400 && ($type = $from->getType())) {
+			$prop->setType($type->getName());
+			$prop->setNullable($type->allowsNull());
+			$prop->setInitialized(array_key_exists($prop->getName(), $defaults));
+		}
 		$prop->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));
 		return $prop;
 	}

src/PhpGenerator/Printer.php

@@ -103,9 +103,12 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
 
 		$properties = [];
 		foreach ($class->getProperties() as $property) {
+			$type = $property->getType();
 			$properties[] = Helpers::formatDocComment((string) $property->getComment())
-				. ($property->getVisibility() ?: 'public') . ($property->isStatic() ? ' static' : '') . ' $' . $property->getName()
-				. ($property->getValue() === null ? '' : ' = ' . $this->dump($property->getValue()))
+				. ($property->getVisibility() ?: 'public') . ($property->isStatic() ? ' static' : '') . ' '
+				. ($type ? ($property->isNullable() ? '?' : '') . ($this->resolveTypes && $namespace ? $namespace->unresolveName($type) : $type) . ' ' : '')
+				. '$' . $property->getName()
+				. ($property->getValue() === null && !$property->isInitialized() ? '' : ' = ' . $this->dump($property->getValue()))
 				. ";\n";
 		}
 

src/PhpGenerator/Property.php

@@ -30,6 +30,15 @@ final class Property
 	/** @var bool */
 	private $static = false;
 
+	/** @var string|null */
+	private $type;
+
+	/** @var bool */
+	private $nullable = false;
+
+	/** @var bool */
+	private $initialized = false;
+
 
 	/**
 	 * @return static
@@ -61,4 +70,52 @@ public function isStatic(): bool
 	{
 		return $this->static;
 	}
+
+
+	/**
+	 * @return static
+	 */
+	public function setType(?string $val): self
+	{
+		$this->type = $val;
+		return $this;
+	}
+
+
+	public function getType(): ?string
+	{
+		return $this->type;
+	}
+
+
+	/**
+	 * @return static
+	 */
+	public function setNullable(bool $state = true): self
+	{
+		$this->nullable = $state;
+		return $this;
+	}
+
+
+	public function isNullable(): bool
+	{
+		return $this->nullable;
+	}
+
+
+	/**
+	 * @return static
+	 */
+	public function setInitialized(bool $state = true): self
+	{
+		$this->initialized = $state;
+		return $this;
+	}
+
+
+	public function isInitialized(): bool
+	{
+		return $this->initialized;
+	}
 }

tests/PhpGenerator/ClassType.from.74.phpt

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @phpVersion 7.4
+ */
+
+declare(strict_types=1);
+
+use Nette\PhpGenerator\ClassType;
+
+
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/fixtures/classes.php74';
+
+$res[] = ClassType::from(new Abc\Class7);
+
+sameFile(__DIR__ . '/expected/ClassType.from.74.expect', implode("\n", $res));

tests/PhpGenerator/ClassType.phpt

@@ -53,6 +53,14 @@ $class->addProperty('handle')
 $class->addProperty('order')
 	->setValue(new PhpLiteral('RecursiveIteratorIterator::SELF_FIRST'));
 
+$class->addProperty('typed1')
+	->setType('array');
+
+$class->addProperty('typed2')
+	->setType('array')
+	->setNullable()
+	->setInitialized();
+
 $p = $class->addProperty('sections', ['first' => true])
 	->setStatic(true);
 
@@ -115,7 +123,7 @@ $class->setMethods(array_values($methods));
 Assert::same($methods, $class->getMethods());
 
 $properties = $class->getProperties();
-Assert::count(3, $properties);
+Assert::count(5, $properties);
 $class->setProperties(array_values($properties));
 Assert::same($properties, $class->getProperties());
 

tests/PhpGenerator/expected/ClassType.expect

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

tests/PhpGenerator/expected/ClassType.from.74.expect

@@ -0,0 +1,10 @@
+class Class7
+{
+	public \A $a;
+
+	public ?\B $b;
+
+	public ?\C $c = null;
+
+	public ?int $i = 1;
+}

tests/PhpGenerator/fixtures/classes.php74

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Abc;
+
+class Class7
+{
+	public \A $a;
+	public ?\B $b;
+	public ?\C $c = null;
+	public ?int $i = 1;
+}