ClassType, Method: class types are not resolved when namespace is not specified [#21]

Author: dg

src/PhpGenerator/ClassType.php

@@ -121,7 +121,7 @@ public function __toString()
 		}
 
 		$mapper = function (array $arr) {
-			return array_map([$this->namespace ?: new PhpNamespace, 'unresolveName'], $arr);
+			return $this->namespace ? array_map([$this->namespace, 'unresolveName'], $arr) : $arr;
 		};
 
 		return Strings::normalize(

src/PhpGenerator/Method.php

@@ -103,12 +103,11 @@ public function __construct($name = NULL)
 	 */
 	public function __toString()
 	{
-		$namespace = $this->namespace ?: new PhpNamespace;
 		$parameters = [];
 		foreach ($this->parameters as $param) {
 			$variadic = $this->variadic && $param === end($this->parameters);
-
-			$parameters[] = ($param->getTypeHint() ? $namespace->unresolveName($param->getTypeHint()) . ' ' : '')
+			$hint = $param->getTypeHint();
+			$parameters[] = ($hint ? ($this->namespace ? $this->namespace->unresolveName($hint) : $hint) . ' ' : '')
 				. ($param->isReference() ? '&' : '')
 				. ($variadic ? '...' : '')
 				. '$' . $param->getName()
@@ -129,7 +128,7 @@ public function __toString()
 			. ' ' . $this->name
 			. '(' . implode(', ', $parameters) . ')'
 			. ($this->uses ? ' use (' . implode(', ', $uses) . ')' : '')
-			. ($this->returnType ? ': ' . $namespace->unresolveName($this->returnType) : '')
+			. ($this->returnType ? ': ' . ($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) . '}');
 	}

tests/PhpGenerator/PhpNamespace.fqn1.expect

@@ -1,15 +1,15 @@
-class Example extends ParentClass implements One, Two
+class Example extends \ParentClass implements One, \Two
 {
 	use Three;
-	use Four;
+	use \Four;
 
 
 	public function one(): One
 	{
 	}
 
 
-	public function two(One $one, Two $two): Two
+	public function two(One $one, \Two $two): \Two
 	{
 	}