refactoring

Author: dg

src/PhpGenerator/ClassType.php

@@ -116,14 +116,9 @@ public function __toString()
 				. ";\n";
 		}
 
-		$extends = (array) $this->extends;
-		$implements = $this->implements;
-		$traits = $this->traits;
-		if ($this->namespace) {
-			$extends = array_map([$this->namespace, 'unresolveName'], $extends);
-			$implements = array_map([$this->namespace, 'unresolveName'], $implements);
-			$traits = array_map([$this->namespace, 'unresolveName'], $traits);
-		}
+		$mapper = function (array $arr) {
+			return array_map([$this->namespace ?: new PhpNamespace, 'unresolveName'], $arr);
+		};
 
 		foreach ($this->methods as $method) {
 			$method->setNamespace($this->namespace);
@@ -135,11 +130,11 @@ public function __toString()
 			. ($this->final ? 'final ' : '')
 			. $this->type . ' '
 			. $this->name . ' '
-			. ($extends ? 'extends ' . implode(', ', $extends) . ' ' : '')
-			. ($implements ? 'implements ' . implode(', ', $implements) . ' ' : '')
+			. ($this->extends ? 'extends ' . implode(', ', $mapper((array) $this->extends)) . ' ' : '')
+			. ($this->implements ? 'implements ' . implode(', ', $mapper($this->implements)) . ' ' : '')
 			. "\n{\n"
 			. Strings::indent(
-				($traits ? 'use ' . implode(";\nuse ", $traits) . ";\n\n" : '')
+				($this->traits ? 'use ' . implode(";\nuse ", $mapper($this->traits)) . ";\n\n" : '')
 				. ($this->consts ? implode('', $consts) . "\n" : '')
 				. ($this->properties ? implode("\n", $properties) . "\n" : '')
 				. ($this->methods ? "\n" . implode("\n\n\n", $this->methods) . "\n\n" : ''), 1)

src/PhpGenerator/Method.php

@@ -103,14 +103,12 @@ 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);
-			$hint = $this->namespace
-				? $this->namespace->unresolveName((string) $param->getTypeHint())
-				: $param->getTypeHint();
 
-			$parameters[] = ($hint ? $hint . ' ' : '')
+			$parameters[] = ($param->getTypeHint() ? $namespace->unresolveName($param->getTypeHint()) . ' ' : '')
 				. ($param->isReference() ? '&' : '')
 				. ($variadic ? '...' : '')
 				. '$' . $param->getName()
@@ -120,9 +118,6 @@ public function __toString()
 		foreach ($this->uses as $param) {
 			$uses[] = ($param->isReference() ? '&' : '') . '$' . $param->getName();
 		}
-		$returnType = $this->namespace
-			? $this->namespace->unresolveName((string) $this->returnType)
-			: $this->returnType;
 
 		return ($this->comment ? str_replace("\n", "\n * ", "/**\n" . $this->comment) . "\n */\n" : '')
 			. ($this->abstract ? 'abstract ' : '')
@@ -134,7 +129,7 @@ public function __toString()
 			. ' ' . $this->name
 			. '(' . implode(', ', $parameters) . ')'
 			. ($this->uses ? ' use (' . implode(', ', $uses) . ')' : '')
-			. ($returnType ? ': ' . $returnType : '')
+			. ($this->returnType ? ': ' . $namespace->unresolveName($this->returnType) : '')
 			. ($this->abstract || $this->body === FALSE ? ';'
 				: ($this->name ? "\n" : ' ') . "{\n" . Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1) . '}');
 	}