Method, ClassType: better whitespace usage

Author: dg

src/PhpGenerator/ClassType.php

@@ -157,13 +157,13 @@ public function __toString()
 			. $this->name . ' '
 			. ($this->extends ? 'extends ' . implode(', ', $extends) . ' ' : '')
 			. ($this->implements ? 'implements ' . implode(', ', $implements) . ' ' : '')
-			. "\n{\n\n"
+			. "\n{\n"
 			. Strings::indent(
 				($this->traits ? 'use ' . implode(', ', $traits) . ";\n\n" : '')
-				. ($this->consts ? implode('', $consts) . "\n\n" : '')
-				. ($this->properties ? implode("\n", $properties) . "\n\n" : '')
-				. implode("\n\n\n", $this->methods), 1)
-			. "\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)
+			. '}'
 		) . "\n";
 	}
 

src/PhpGenerator/Method.php

@@ -108,7 +108,7 @@ public function __toString()
 			. '(' . implode(', ', $parameters) . ')'
 			. ($this->uses ? ' use (' . implode(', ', $uses) . ')' : '')
 			. ($this->abstract || $this->body === FALSE ? ';'
-				: ($this->name ? "\n" : ' ') . "{\n" . Nette\Utils\Strings::indent(trim($this->body), 1) . "\n}");
+				: ($this->name ? "\n" : ' ') . "{\n" . Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1) . '}');
 	}
 
 

tests/PhpGenerator/ClassType.expect

@@ -6,13 +6,11 @@
  */
 abstract final class Example extends ParentClass implements IExample, IOne
 {
-
 	use ObjectTrait;
 
 	const ROLE = 'admin';
 	const FORCE_ARRAY = Nette\Utils\Json::FORCE_ARRAY;
 
-
 	/** @var resource  orignal file handle */
 	private $handle;
 

tests/PhpGenerator/ClassType.from.expect

@@ -11,9 +11,6 @@ interface Interface1
 
 interface Interface2
 {
-
-
-
 }
 
 abstract class Class1 implements Interface1
@@ -24,7 +21,6 @@ abstract class Class1 implements Interface1
 	 */
 	function func1()
 	{
-
 	}
 
 
@@ -34,7 +30,6 @@ abstract class Class1 implements Interface1
 
 class Class2 extends Class1 implements Interface2
 {
-
 	/**
 	 * Public
 	 * @var int
@@ -55,13 +50,11 @@ class Class2 extends Class1 implements Interface2
 	 */
 	private function & func3(array $a%a?%, Class2 $b = NULL, Unknown $c, \Xyz\Unknown $d, $e)
 	{
-
 	}
 
 
 	final function func2()
 	{
-
 	}
 
 }

tests/PhpGenerator/ClassType.from.trait.expect

@@ -6,7 +6,6 @@ trait Trait1
 
 	function func1()
 	{
-
 	}
 
 }
@@ -16,7 +15,6 @@ trait Trait2
 
 	protected function func2()
 	{
-
 	}
 
 }
@@ -26,20 +24,15 @@ abstract class Class1
 
 	function func1()
 	{
-
 	}
 
 
 	protected function func2()
 	{
-
 	}
 
 }
 
 class Class2 extends Class1
 {
-
-
-
 }

tests/PhpGenerator/ClassType.inheritance.expect

@@ -1,6 +1,5 @@
 class B extends A
 {
-
 	public $d;
 
 	protected $e;
@@ -10,7 +9,6 @@ class B extends A
 
 	function bar()
 	{
-
 	}
 
 }

tests/PhpGenerator/PhpFile.bracketed.expect

@@ -9,25 +9,16 @@ namespace Foo {
 
 	class A implements A, \Bar\C
 	{
-
 		use C, \Bar\D;
 
-
-
 	}
 
 	interface B
 	{
-
-
-
 	}
 
 	trait C
 	{
-
-
-
 	}
 
 }
@@ -37,25 +28,16 @@ namespace Bar {
 
 	class B extends \Foo\A implements \Foo\B
 	{
-
 		use \Foo\C;
 
-
-
 	}
 
 	interface C
 	{
-
-
-
 	}
 
 	trait D
 	{
-
-
-
 	}
 
 }
@@ -65,23 +47,14 @@ namespace Baz {
 
 	class E
 	{
-
-
-
 	}
 
 	interface F extends \Foo\B, \Bar\C
 	{
-
-
-
 	}
 
 	trait G
 	{
-
-
-
 	}
 
 }
@@ -91,9 +64,6 @@ namespace {
 
 	class H
 	{
-
-
-
 	}
 
 }
@@ -103,9 +73,6 @@ namespace FooBar {
 
 	class I
 	{
-
-
-
 	}
 
 }

tests/PhpGenerator/PhpFile.regular.expect

@@ -9,73 +9,46 @@ namespace Foo;
 
 class A implements A, \Bar\C
 {
-
 	use C, \Bar\D;
 
-
-
 }
 
 interface B
 {
-
-
-
 }
 
 trait C
 {
-
-
-
 }
 
 
 namespace Bar;
 
 class B extends \Foo\A implements \Foo\B
 {
-
 	use \Foo\C;
 
-
-
 }
 
 interface C
 {
-
-
-
 }
 
 trait D
 {
-
-
-
 }
 
 
 namespace Baz;
 
 class E
 {
-
-
-
 }
 
 interface F extends \Foo\B, \Bar\C
 {
-
-
-
 }
 
 trait G
 {
-
-
-
 }

tests/PhpGenerator/PhpNamespace.expect

@@ -4,19 +4,15 @@ use Bar\C;
 
 class A implements A, C
 {
-
 	use \Bar\D;
 
+
 	public function test(C $test)
 	{
-
 	}
 
 }
 
 interface B
 {
-
-
-
 }