Printer: fixed combination nullable + union type [Closes #72]

Author: dg

src/PhpGenerator/Printer.php

@@ -287,9 +287,18 @@ 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->unresolveUnionType($type) : $type)
-			: '';
+		if ($type === null) {
+			return '';
+		}
+		if ($this->resolveTypes && $namespace) {
+			$type = $namespace->unresolveUnionType($type);
+		}
+		if ($nullable) {
+			$type = strpos('|', $type) === false
+				? '?' . $type
+				: $type . '|null';
+		}
+		return $type;
 	}
 
 

tests/PhpGenerator/ClassType.phpt

@@ -127,6 +127,9 @@ $method->addParameter('res', null)
 		->setReference(true)
 		->setType(Type::union(Type::ARRAY, 'null'));
 
+$method->addParameter('bar', null)
+		->setType('stdClass|string')
+		->setNullable(true);
 
 $class->addTrait('foo');
 $class->removeTrait('foo');
@@ -150,7 +153,7 @@ $class->setProperties(array_values($properties));
 Assert::same($properties, $class->getProperties());
 
 $parameters = $method->getParameters();
-Assert::count(2, $parameters);
+Assert::count(3, $parameters);
 $method->setParameters(array_values($parameters));
 Assert::same($parameters, $method->getParameters());
 

tests/PhpGenerator/expected/ClassType.expect

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