implemented support for PHP 8 union types

Author: dg

readme.md

@@ -82,7 +82,7 @@ $class->addProperty('items', [1, 2, 3])
 	->addComment('@var int[]');
 
 $class->addProperty('list')
-	->setType('array') // or setType(Type::ARRAY)
+	->setType('array')
 	->setNullable()
 	->setInitialized(); // prints '= null'
 ```
@@ -172,6 +172,23 @@ $methodRecount = $methodCount->cloneWithName('recount');
 $class->addMember($methodRecount);
 ```
 
+Types
+-----
+
+Each type or union type can be passed as a string, you can also use predefined constants for native types:
+
+```php
+use Nette\PhpGenerator\Type;
+
+$member->setType('array');
+$member->setType(Type::ARRAY);
+$member->setType('array|string');
+$member->setType(null); // removes type
+```
+
+The same applies to the method `setReturnType()`.
+
+
 Tabs versus Spaces
 ------------------
 

src/PhpGenerator/Factory.php

@@ -104,6 +104,8 @@ public function fromMethodReflection(\ReflectionMethod $from): Method
 		if ($from->getReturnType() instanceof \ReflectionNamedType) {
 			$method->setReturnType($from->getReturnType()->getName());
 			$method->setReturnNullable($from->getReturnType()->allowsNull());
+		} elseif ($from->getReturnType() instanceof \ReflectionUnionType) {
+			$method->setReturnType((string) $from->getReturnType());
 		}
 		return $method;
 	}
@@ -123,6 +125,8 @@ public function fromFunctionReflection(\ReflectionFunction $from, bool $withBody
 		if ($from->getReturnType() instanceof \ReflectionNamedType) {
 			$function->setReturnType($from->getReturnType()->getName());
 			$function->setReturnNullable($from->getReturnType()->allowsNull());
+		} elseif ($from->getReturnType() instanceof \ReflectionUnionType) {
+			$function->setReturnType((string) $from->getReturnType());
 		}
 		$function->setBody($withBody ? $this->loadFunctionBody($from) : '');
 		return $function;
@@ -145,8 +149,12 @@ public function fromParameterReflection(\ReflectionParameter $from): Parameter
 			? new PromotedParameter($from->name)
 			: new Parameter($from->name);
 		$param->setReference($from->isPassedByReference());
-		$param->setType($from->getType() instanceof \ReflectionNamedType ? $from->getType()->getName() : null);
-		$param->setNullable($from->hasType() && $from->getType()->allowsNull());
+		if ($from->getType() instanceof \ReflectionNamedType) {
+			$param->setType($from->getType()->getName());
+			$param->setNullable($from->getType()->allowsNull());
+		} elseif ($from->getType() instanceof \ReflectionUnionType) {
+			$param->setType((string) $from->getType());
+		}
 		if ($from->isDefaultValueAvailable()) {
 			$param->setDefaultValue($from->isDefaultValueConstant()
 				? new Literal($from->getDefaultValueConstantName())
@@ -184,10 +192,14 @@ public function fromPropertyReflection(\ReflectionProperty $from): Property
 				? ClassType::VISIBILITY_PRIVATE
 				: ($from->isProtected() ? ClassType::VISIBILITY_PROTECTED : ClassType::VISIBILITY_PUBLIC)
 		);
-		if (PHP_VERSION_ID >= 70400 && ($from->getType() instanceof \ReflectionNamedType)) {
-			$prop->setType($from->getType()->getName());
-			$prop->setNullable($from->getType()->allowsNull());
-			$prop->setInitialized(array_key_exists($prop->getName(), $defaults));
+		if (PHP_VERSION_ID >= 70400) {
+			if ($from->getType() instanceof \ReflectionNamedType) {
+				$prop->setType($from->getType()->getName());
+				$prop->setNullable($from->getType()->allowsNull());
+			} elseif ($from->getType() instanceof \ReflectionUnionType) {
+				$prop->setType((string) $from->getType());
+			}
+			$prop->setInitialized($from->hasType() && array_key_exists($prop->getName(), $defaults));
 		}
 		$prop->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));
 		$prop->setAttributes(self::getAttributes($from));

src/PhpGenerator/PhpNamespace.php

@@ -126,6 +126,12 @@ public function getUses(): array
 	}
 
 
+	public function unresolveUnionType(string $type): string
+	{
+		return implode('|', array_map([$this, 'unresolveName'], explode('|', $type)));
+	}
+
+
 	public function unresolveName(string $name): string
 	{
 		if (isset(self::KEYWORDS[strtolower($name)]) || $name === '') {

src/PhpGenerator/Printer.php

@@ -113,7 +113,7 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
 	{
 		$class->validate();
 		$resolver = $this->resolveTypes && $namespace
-			? [$namespace, 'unresolveName']
+			? [$namespace, 'unresolveUnionType']
 			: function ($s) { return $s; };
 
 		$traits = [];
@@ -288,7 +288,7 @@ public function printParameters($function, PhpNamespace $namespace = null): stri
 	public function printType(?string $type, bool $nullable = false, PhpNamespace $namespace = null): string
 	{
 		return $type
-			? ($nullable ? '?' : '') . ($this->resolveTypes && $namespace ? $namespace->unresolveName($type) : $type)
+			? ($nullable ? '?' : '') . ($this->resolveTypes && $namespace ? $namespace->unresolveUnionType($type) : $type)
 			: '';
 	}
 

tests/PhpGenerator/ClassType.from.80.phpt

@@ -14,5 +14,6 @@ require __DIR__ . '/fixtures/classes.php80';
 
 $res[] = ClassType::from(new Abc\Class8(null));
 $res[] = ClassType::from(new Abc\Class9);
+$res[] = ClassType::from(new Abc\Class10);
 
 sameFile(__DIR__ . '/expected/ClassType.from.80.expect', implode("\n", $res));

tests/PhpGenerator/ClassType.phpt

@@ -121,7 +121,7 @@ $method->addParameter('item');
 
 $method->addParameter('res', null)
 		->setReference(true)
-		->setType(Type::ARRAY);
+		->setType(Type::union(Type::ARRAY, 'null'));
 
 
 $class->addTrait('foo');

tests/PhpGenerator/PhpNamespace.phpt

@@ -36,6 +36,10 @@ Assert::same('\A', $namespace->unresolveName('\A'));
 Assert::same('\A', $namespace->unresolveName('A'));
 Assert::same('A', $namespace->unresolveName('foo\A'));
 
+Assert::same('A', $namespace->unresolveUnionType('foo\A'));
+Assert::same('null|A', $namespace->unresolveUnionType('null|foo\A'));
+Assert::same('', $namespace->unresolveUnionType(''));
+
 $namespace->addUse('Bar\C');
 Assert::same(['C' => 'Bar\\C'], $namespace->getUses());
 
@@ -71,11 +75,13 @@ $classA
 
 $method = $classA->addMethod('test');
 $method->addAttribute('Foo\\A');
+$method->setReturnType('static|Foo\\A');
 
 $method->addParameter('a')->setType('Bar\C')->addAttribute('Bar\\D');
 $method->addParameter('b')->setType('self');
 $method->addParameter('c')->setType('parent');
 $method->addParameter('d')->setType('array');
 $method->addParameter('e')->setType('callable');
+$method->addParameter('f')->setType('Bar\C|string');
 
 sameFile(__DIR__ . '/expected/PhpNamespace.expect', (string) $namespace);

tests/PhpGenerator/expected/ClassType.expect

@@ -42,5 +42,5 @@ abstract class Example extends ParentClass implements IExample, IOne
 	}
 
 
-	abstract public function show($item, array &$res = null);
+	abstract public function show($item, array|null &$res = null);
 }

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

@@ -2,7 +2,7 @@ class Class8
 {
 	public function __construct(
 		public $a,
-		public int $b = 10,
+		public string|int $b = 10,
 		$c = null,
 	) {
 	}
@@ -33,3 +33,13 @@ class Class9
 	{
 	}
 }
+
+class Class10
+{
+	public string|int $prop;
+
+
+	public function test(string|int $param): string|int
+	{
+	}
+}

tests/PhpGenerator/expected/PhpNamespace.expect

@@ -14,7 +14,8 @@ class A implements A, C
 		parent $c,
 		array $d,
 		callable $e,
-	) {
+		C|string $f,
+	): static|A {
 	}
 }