ClassType::__toString() refactoring

Author: dg

src/PhpGenerator/ClassType.php

@@ -125,26 +125,15 @@ public function __toString()
 				. ";\n";
 		}
 
-		$extends = $implements = $traits = array();
+		$extends = (array) $this->extends;
+		$implements = $this->implements;
+		$traits = $this->traits;
 		if ($this->namespace) {
-			foreach ((array) $this->extends as $name) {
-				$extends[] = $this->namespace->unresolveName($name);
+			$extends = array_map(array($this->namespace, 'unresolveName'), $extends);
+			$implements = array_map(array($this->namespace, 'unresolveName'), $implements);
+			$traits = array_map(array($this->namespace, 'unresolveName'), $traits);
 			}
 
-			foreach ((array) $this->implements as $name) {
-				$implements[] = $this->namespace->unresolveName($name);
-			}
-
-			foreach ((array) $this->traits as $name) {
-				$traits[] = $this->namespace->unresolveName($name);
-			}
-
-		} else {
-			$extends = (array) $this->extends;
-			$implements = (array) $this->implements;
-			$traits = (array) $this->traits;
-		}
-
 		foreach ($this->methods as $method) {
 			$method->setNamespace($this->namespace);
 		}
@@ -155,11 +144,11 @@ public function __toString()
 			. ($this->final ? 'final ' : '')
 			. $this->type . ' '
 			. $this->name . ' '
-			. ($this->extends ? 'extends ' . implode(', ', $extends) . ' ' : '')
-			. ($this->implements ? 'implements ' . implode(', ', $implements) . ' ' : '')
+			. ($extends ? 'extends ' . implode(', ', $extends) . ' ' : '')
+			. ($implements ? 'implements ' . implode(', ', $implements) . ' ' : '')
 			. "\n{\n"
 			. Strings::indent(
-				($this->traits ? 'use ' . implode(', ', $traits) . ";\n\n" : '')
+				($traits ? 'use ' . implode(', ', $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)