coding style: fixed spaces & use statements order

dg · dg · commit f9fa340d2c36 · 2017-07-11T13:59:17.000+02:00
diff --git a/src/PhpGenerator/ClassType.php b/src/PhpGenerator/ClassType.php
@@ -474,5 +474,4 @@ private function validate(array $names)
 			}
 		}
 	}
-
 }
diff --git a/src/PhpGenerator/Closure.php b/src/PhpGenerator/Closure.php
@@ -72,5 +72,4 @@ public function addUse($name): Parameter
 	{
 		return $this->uses[] = new Parameter($name);
 	}
-
 }
diff --git a/src/PhpGenerator/Constant.php b/src/PhpGenerator/Constant.php
@@ -40,5 +40,4 @@ public function getValue()
 	{
 		return $this->value;
 	}
-
 }
diff --git a/src/PhpGenerator/Factory.php b/src/PhpGenerator/Factory.php
@@ -117,5 +117,4 @@ public function fromPropertyReflection(\ReflectionProperty $from): Property
 		$prop->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));
 		return $prop;
 	}
-
 }
diff --git a/src/PhpGenerator/GlobalFunction.php b/src/PhpGenerator/GlobalFunction.php
@@ -43,5 +43,4 @@ public function __toString(): string
 			. $this->returnTypeToString()
 			. "\n{\n" . Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1) . '}';
 	}
-
 }
diff --git a/src/PhpGenerator/Helpers.php b/src/PhpGenerator/Helpers.php
@@ -256,5 +256,4 @@ public static function extractShortName(string $name): string
 	{
 		return ($pos = strrpos($name, '\\')) === FALSE ? $name : substr($name, $pos + 1);
 	}
-
 }
diff --git a/src/PhpGenerator/Method.php b/src/PhpGenerator/Method.php
@@ -149,5 +149,4 @@ public function isAbstract(): bool
 	{
 		return $this->abstract;
 	}
-
 }
diff --git a/src/PhpGenerator/Parameter.php b/src/PhpGenerator/Parameter.php
@@ -132,5 +132,4 @@ public function hasDefaultValue(): bool
 	{
 		return $this->hasDefaultValue;
 	}
-
 }
diff --git a/src/PhpGenerator/PhpFile.php b/src/PhpGenerator/PhpFile.php
@@ -75,5 +75,4 @@ public function __toString(): string
 			. implode("\n\n", $this->namespaces)
 		) . "\n";
 	}
-
 }
diff --git a/src/PhpGenerator/PhpLiteral.php b/src/PhpGenerator/PhpLiteral.php
@@ -29,5 +29,4 @@ public function __toString(): string
 	{
 		return $this->value;
 	}
-
 }
diff --git a/src/PhpGenerator/PhpNamespace.php b/src/PhpGenerator/PhpNamespace.php
@@ -214,5 +214,4 @@ public function __toString(): string
 				. $body;
 		}
 	}
-
 }
diff --git a/src/PhpGenerator/Property.php b/src/PhpGenerator/Property.php
@@ -61,5 +61,4 @@ public function isStatic(): bool
 	{
 		return $this->static;
 	}
-
 }
diff --git a/src/PhpGenerator/Traits/CommentAware.php b/src/PhpGenerator/Traits/CommentAware.php
@@ -47,5 +47,4 @@ public function addComment(string $val): self
 		$this->comment .= $this->comment ? "\n$val" : $val;
 		return $this;
 	}
-
 }
diff --git a/src/PhpGenerator/Traits/FunctionLike.php b/src/PhpGenerator/Traits/FunctionLike.php
@@ -207,5 +207,4 @@ protected function returnTypeToString(): string
 			? ': ' . ($this->returnNullable ? '?' : '') . ($this->namespace ? $this->namespace->unresolveName($this->returnType) : $this->returnType)
 			: '';
 	}
-
 }
diff --git a/src/PhpGenerator/Traits/NameAware.php b/src/PhpGenerator/Traits/NameAware.php
@@ -34,5 +34,4 @@ public function getName(): string
 	{
 		return $this->name;
 	}
-
 }
diff --git a/src/PhpGenerator/Traits/VisibilityAware.php b/src/PhpGenerator/Traits/VisibilityAware.php
@@ -42,5 +42,4 @@ public function getVisibility()
 	{
 		return $this->visibility;
 	}
-
 }
diff --git a/tests/PhpGenerator/ClassType.from.anonymous.phpt b/tests/PhpGenerator/ClassType.from.anonymous.phpt
@@ -15,19 +15,31 @@ require __DIR__ . '/../bootstrap.php';
 
 abstract class Class1
 {
-	function func1() {}
+	function func1()
+	{
+	}
 }
 
 
 $res[] = ClassType::from(new class {
 	public $a;
 	private $b;
-	function a() {}
-	private function b() {}
+
+
+	function a()
+	{
+	}
+
+
+	private function b()
+	{
+	}
 });
 
 $res[] = ClassType::from(new class extends Class1 {
-	function a() {}
+	function a()
+	{
+	}
 });
 
 Assert::matchFile(__DIR__ . '/ClassType.from.anonymous.expect', implode("\n", $res));
diff --git a/tests/PhpGenerator/ClassType.from.php71.phpt b/tests/PhpGenerator/ClassType.from.php71.phpt
@@ -16,11 +16,19 @@ require __DIR__ . '/../bootstrap.php';
 /** */
 class ClassA
 {
-	function func1(A $a, ?B $b, ?C $c = NULL, D $d = NULL, E $e, ?int $i = 1, ?array $arr = []) {}
+	function func1(A $a, ?B $b, ?C $c = NULL, D $d = NULL, E $e, ?int $i = 1, ?array $arr = [])
+	{
+	}
 
-	function func2(): ?stdClass {}
 
-	function func3(): void {}
+	function func2(): ?stdClass
+	{
+	}
+
+
+	function func3(): void
+	{
+	}
 }
 
 class ClassB
diff --git a/tests/PhpGenerator/ClassType.from.phpt b/tests/PhpGenerator/ClassType.from.phpt
@@ -33,7 +33,9 @@ abstract class Class1 implements Interface1
 {
 	/** @return Class1 */
 	function func1()
-	{}
+	{
+	}
+
 
 	abstract protected function func2();
 }
@@ -53,15 +55,19 @@ class Class2 extends Class1 implements Interface2
 
 	static public $static;
 
+
 	/**
 	 * Func3
 	 * @return Class1
 	 */
 	private function &func3(array $a = [], Class2 $b = NULL, \Abc\Unknown $c, \Xyz\Unknown $d, callable $e, $f = Unknown::ABC, $g)
-	{}
+	{
+	}
+
 
 	final function func2()
-	{}
+	{
+	}
 }
 
 class Class3
diff --git a/tests/PhpGenerator/ClassType.from.trait.phpt b/tests/PhpGenerator/ClassType.from.trait.phpt
@@ -19,13 +19,15 @@ require __DIR__ . '/../bootstrap.php';
 trait Trait1
 {
 	public function func1()
-	{}
+	{
+	}
 }
 
 trait Trait2
 {
 	protected function func2()
-	{}
+	{
+	}
 }
 
 abstract class Class1
diff --git a/tests/PhpGenerator/ClassType.inheritance.phpt b/tests/PhpGenerator/ClassType.inheritance.phpt
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;
-use ReflectionClass;
 use Tester\Assert;
 
 
@@ -16,6 +15,7 @@ class A
 	protected $b;
 	private $c;
 
+
 	function foo()
 	{
 	}
@@ -28,6 +28,7 @@ class B extends A
 	protected $e;
 	private $f;
 
+
 	function bar()
 	{
 		return 3;
diff --git a/tests/PhpGenerator/Factory.phpt b/tests/PhpGenerator/Factory.phpt
@@ -20,7 +20,8 @@ Assert::type(Nette\PhpGenerator\ClassType::class, $res);
 Assert::same('stdClass', $res->getName());
 
 
-$res = $factory->fromClassReflection(new ReflectionClass(new class {}));
+$res = $factory->fromClassReflection(new ReflectionClass(new class {
+}));
 Assert::type(Nette\PhpGenerator\ClassType::class, $res);
 Assert::null($res->getName());
 
diff --git a/tests/PhpGenerator/GlobalFunction.phpt b/tests/PhpGenerator/GlobalFunction.phpt
@@ -10,9 +10,11 @@ require __DIR__ . '/../bootstrap.php';
 
 
 /** global */
-function func(stdClass $a, $b = NULL) {
+function func(stdClass $a, $b = NULL)
+{
 };
 
+
 $function = GlobalFunction::from('func');
 Assert::match(
 '/**
diff --git a/tests/PhpGenerator/Helpers.dump().phpt b/tests/PhpGenerator/Helpers.dump().phpt
@@ -62,11 +62,13 @@ class Test2 extends Test
 	private $c = 4;
 	public $d = 5;
 
+
 	function __sleep()
 	{
 		return ['c', 'b', 'a'];
 	}
 
+
 	function __wakeup()
 	{
 	}
@@ -80,11 +82,13 @@ class Test3 implements Serializable
 {
 	private $a;
 
+
 	function serialize()
 	{
 		return '';
 	}
 
+
 	function unserialize($s)
 	{
 	}
@@ -100,7 +104,8 @@ Assert::exception(function () {
 
 
 class TestDateTime extends DateTime
-{}
+{
+}
 
 Assert::same(
 	"new DateTime('2016-06-22 20:52:43.123400', new DateTimeZone('Europe/Prague'))",
@@ -116,5 +121,6 @@ Assert::match(
 );
 
 Assert::exception(function () {
-	Helpers::dump(new class {});
+	Helpers::dump(new class {
+	});
 }, Nette\InvalidArgumentException::class, 'Cannot dump anonymous class.');
diff --git a/tests/PhpGenerator/Method.returnTypes.phpt b/tests/PhpGenerator/Method.returnTypes.phpt
@@ -8,7 +8,9 @@ declare(strict_types=1);
 
 namespace A
 {
-	class Foo {}
+	class Foo
+	{
+	}
 }
 
 namespace
@@ -24,6 +26,7 @@ namespace
 	interface A
 	{
 		function testClass(): \A\Foo;
+
 		function testScalar(): string;
 	}
 
diff --git a/tests/PhpGenerator/Method.variadics.phpt b/tests/PhpGenerator/Method.variadics.phpt
@@ -7,7 +7,6 @@
 declare(strict_types=1);
 
 use Nette\PhpGenerator\Method;
-use Nette\PhpGenerator\Parameter;
 use Tester\Assert;
 
 
@@ -19,6 +18,7 @@ require __DIR__ . '/../bootstrap.php';
 interface Variadics
 {
 	function foo(...$foo);
+
 	function bar($foo, array &...$bar);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -474,5 +474,4 @@ private function validate(array $names)`
`474`	`474`	`}`
`475`	`475`	`}`
`476`	`476`	`}`
`477`		`-`
`478`	`477`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,5 +72,4 @@ public function addUse($name): Parameter`
`72`	`72`	`{`
`73`	`73`	`return $this->uses[] = new Parameter($name);`
`74`	`74`	`}`
`75`		`-`
`76`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,4 @@ public function getValue()`
`40`	`40`	`{`
`41`	`41`	`return $this->value;`
`42`	`42`	`}`
`43`		`-`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,5 +117,4 @@ public function fromPropertyReflection(\ReflectionProperty $from): Property`
`117`	`117`	`$prop->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));`
`118`	`118`	`return $prop;`
`119`	`119`	`}`
`120`		`-`
`121`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,4 @@ public function __toString(): string`
`43`	`43`	`. $this->returnTypeToString()`
`44`	`44`	`. "\n{\n" . Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1) . '}';`
`45`	`45`	`}`
`46`		`-`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,5 +256,4 @@ public static function extractShortName(string $name): string`
`256`	`256`	`{`
`257`	`257`	`return ($pos = strrpos($name, '\\')) === FALSE ? $name : substr($name, $pos + 1);`
`258`	`258`	`}`
`259`		`-`
`260`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,5 +149,4 @@ public function isAbstract(): bool`
`149`	`149`	`{`
`150`	`150`	`return $this->abstract;`
`151`	`151`	`}`
`152`		`-`
`153`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,5 +132,4 @@ public function hasDefaultValue(): bool`
`132`	`132`	`{`
`133`	`133`	`return $this->hasDefaultValue;`
`134`	`134`	`}`
`135`		`-`
`136`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,4 @@ public function __toString(): string`
`75`	`75`	`. implode("\n\n", $this->namespaces)`
`76`	`76`	`) . "\n";`
`77`	`77`	`}`
`78`		`-`
`79`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,4 @@ public function __toString(): string`
`29`	`29`	`{`
`30`	`30`	`return $this->value;`
`31`	`31`	`}`
`32`		`-`
`33`	`32`	`}`