Printer: uses single instance for printing methods, classes, namespaces

Author: dg

src/PhpGenerator/Printer.php

@@ -97,6 +97,11 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
 				. ';';
 		}
 
+		$methods = [];
+		foreach ($class->getMethods() as $method) {
+			$methods[] = $this->printMethod($method, $namespace);
+		}
+
 		return Strings::normalize(
 			Helpers::formatDocComment($class->getComment() . "\n")
 			. ($class->isAbstract() ? 'abstract ' : '')
@@ -109,7 +114,7 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
 				($traits ? implode("\n", $traits) . "\n\n" : '')
 				. ($consts ? implode("\n", $consts) . "\n\n" : '')
 				. ($properties ? implode("\n\n", $properties) . "\n\n\n" : '')
-				. ($class->getMethods() ? implode("\n\n\n", $class->getMethods()) . "\n" : ''))
+				. ($methods ? implode("\n\n\n", $methods) . "\n" : ''))
 			. '}'
 		) . ($class->getName() ? "\n" : '');
 	}
@@ -132,8 +137,13 @@ public function printNamespace(PhpNamespace $namespace): string
 			}
 		}
 
+		$classes = [];
+		foreach ($namespace->getClasses() as $class) {
+			$classes[] = $this->printClass($class, $namespace);
+		}
+
 		$body = ($uses ? implode("\n", $uses) . "\n\n" : '')
-			. implode("\n", $namespace->getClasses());
+			. implode("\n", $classes);
 
 		if ($namespace->getBracketedSyntax()) {
 			return 'namespace' . ($name ? " $name" : '') . " {\n\n"
@@ -149,10 +159,15 @@ public function printNamespace(PhpNamespace $namespace): string
 
 	public function printFile(PhpFile $file): string
 	{
+		$namespaces = [];
+		foreach ($file->getNamespaces() as $namespace) {
+			$namespaces[] = $this->printNamespace($namespace);
+		}
+
 		return Strings::normalize(
 			"<?php\n"
 			. ($file->getComment() ? "\n" . Helpers::formatDocComment($file->getComment() . "\n") . "\n" : '')
-			. implode("\n\n", $file->getNamespaces())
+			. implode("\n\n", $namespaces)
 		) . "\n";
 	}
 

tests/PhpGenerator/Printer.namespace.phpt

@@ -33,6 +33,7 @@ $class->addMethod('first')
 
 sameFile(__DIR__ . '/expected/Printer.namespace.expect', $printer->printNamespace($namespace));
 sameFile(__DIR__ . '/expected/Printer.namespace.class.expect', $printer->printClass($class, $namespace));
+sameFile(__DIR__ . '/expected/Printer.namespace.class2.expect', $printer->printClass($class));
 sameFile(__DIR__ . '/expected/Printer.namespace.method.expect', $printer->printMethod($class->getMethod('first')));
 
 

tests/PhpGenerator/expected/Printer.namespace.class2.expect

@@ -0,0 +1,16 @@
+/**
+ * Description of class.
+ * This is example
+ */
+final class A extends ParentClass implements IExample, Foo\IOne
+{
+	use Foo\ObjectTrait;
+
+	/**
+	 * @return resource
+	 */
+	final public function first(Bar\C $var): stdClass
+	{
+		return $this->handle;
+	}
+}