Method, Parameter: added support for PHP 7.1 nullable types

Author: dg

src/PhpGenerator/Method.php

@@ -58,6 +58,9 @@ class Method
 	/** @var string|NULL */
 	private $returnType;
 
+	/** @var bool */
+	private $returnNullable;
+
 
 	/**
 	 * @return static
@@ -88,6 +91,7 @@ public static function from($from)
 		$method->comment = $from->getDocComment() ? preg_replace('#^\s*\* ?#m', '', trim($from->getDocComment(), "/* \r\n\t")) : NULL;
 		if (PHP_VERSION_ID >= 70000 && $from->hasReturnType()) {
 			$method->returnType = (string) $from->getReturnType();
+			$method->returnNullable = $from->getReturnType()->allowsNull();
 		}
 		return $method;
 	}
@@ -111,7 +115,7 @@ public function __toString()
 		foreach ($this->parameters as $param) {
 			$variadic = $this->variadic && $param === end($this->parameters);
 			$hint = $param->getTypeHint();
-			$parameters[] = ($hint ? ($this->namespace ? $this->namespace->unresolveName($hint) : $hint) . ' ' : '')
+			$parameters[] = ($hint ? ($param->isNullable() ? '?' : '') . ($this->namespace ? $this->namespace->unresolveName($hint) : $hint) . ' ' : '')
 				. ($param->isReference() ? '&' : '')
 				. ($variadic ? '...' : '')
 				. '$' . $param->getName()
@@ -132,7 +136,8 @@ public function __toString()
 			. ' ' . $this->name
 			. '(' . implode(', ', $parameters) . ')'
 			. ($this->uses ? ' use (' . implode(', ', $uses) . ')' : '')
-			. ($this->returnType ? ': ' . ($this->namespace ? $this->namespace->unresolveName($this->returnType) : $this->returnType) : '')
+			. ($this->returnType ? ': ' . ($this->returnNullable ? '?' : '')
+				. ($this->namespace ? $this->namespace->unresolveName($this->returnType) : $this->returnType) : '')
 			. ($this->abstract || $this->body === FALSE ? ';'
 				: ($this->name ? "\n" : ' ') . "{\n" . Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1) . '}');
 	}
@@ -355,6 +360,26 @@ public function getReturnReference()
 	}
 
 
+	/**
+	 * @param  bool
+	 * @return static
+	 */
+	public function setReturnNullable($val)
+	{
+		$this->returnNullable = (bool) $val;
+		return $this;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getReturnNullable()
+	{
+		return $this->returnNullable;
+	}
+
+
 	/**
 	 * @param  bool
 	 * @return static

src/PhpGenerator/Parameter.php

@@ -26,6 +26,9 @@ class Parameter
 	/** @var string|NULL */
 	private $typeHint;
 
+	/** @var bool */
+	private $nullable = FALSE;
+
 	/** @var bool */
 	private $hasDefaultValue = FALSE;
 
@@ -42,6 +45,7 @@ public static function from(\ReflectionParameter $from)
 		$param->reference = $from->isPassedByReference();
 		if (PHP_VERSION_ID >= 70000) {
 			$param->typeHint = $from->hasType() ? (string) $from->getType() : NULL;
+			$param->nullable = $from->hasType() && $from->getType()->allowsNull();
 		} elseif ($from->isArray() || $from->isCallable()) {
 			$param->typeHint = $from->isArray() ? 'array' : 'callable';
 		} else {
@@ -57,6 +61,7 @@ public static function from(\ReflectionParameter $from)
 		}
 		$param->hasDefaultValue = $from->isDefaultValueAvailable();
 		$param->defaultValue = $from->isDefaultValueAvailable() ? $from->getDefaultValue() : NULL;
+		$param->nullable = $param->nullable && (!$param->hasDefaultValue || $param->defaultValue !== NULL);
 		return $param;
 	}
 
@@ -148,6 +153,26 @@ public function isOptional()
 	}
 
 
+	/**
+	 * @param  bool
+	 * @return static
+	 */
+	public function setNullable($state = TRUE)
+	{
+		$this->nullable = (bool) $state;
+		return $this;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isNullable()
+	{
+		return $this->nullable;
+	}
+
+
 	/**
 	 * @return static
 	 */

tests/PhpGenerator/ClassType.from.php71.expect

@@ -0,0 +1,18 @@
+class ClassA
+{
+
+	function func1(A $a, ?B $b, C $c = NULL, D $d = NULL, E $e, ?int $i = 1, ?array $arr = [])
+	{
+	}
+
+
+	function func2(): ?stdClass
+	{
+	}
+
+
+	function func3(): void
+	{
+	}
+
+}

tests/PhpGenerator/ClassType.from.php71.phpt

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Test: Nette\PhpGenerator generator.
+ * @phpversion 7.1
+ */
+
+use Nette\PhpGenerator\ClassType;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+/** */
+class ClassA
+{
+	function func1(A $a, ?B $b, ?C $c = NULL, D $d = NULL, E $e, ?int $i = 1, ?array $arr = []) {}
+
+	function func2(): ?stdClass {}
+
+	function func3(): void {}
+}
+
+
+$res[] = ClassType::from(ClassA::class);
+
+Assert::matchFile(__DIR__ . '/ClassType.from.php71.expect', implode("\n", $res));