coding style: fixed spaces & use statements order

dg · dg · commit 4b767601ce49 · 2017-07-11T13:56:05.000+02:00
diff --git a/src/PhpGenerator/ClassType.php b/src/PhpGenerator/ClassType.php
@@ -507,5 +507,4 @@ private function validate(array $names)
 			}
 		}
 	}
-
 }
diff --git a/src/PhpGenerator/Closure.php b/src/PhpGenerator/Closure.php
@@ -83,5 +83,4 @@ public function addUse($name)
 	{
 		return $this->uses[] = new Parameter($name);
 	}
-
 }
diff --git a/src/PhpGenerator/Constant.php b/src/PhpGenerator/Constant.php
@@ -41,5 +41,4 @@ public function getValue()
 	{
 		return $this->value;
 	}
-
 }
diff --git a/src/PhpGenerator/Factory.php b/src/PhpGenerator/Factory.php
@@ -144,5 +144,4 @@ public function fromPropertyReflection(\ReflectionProperty $from)
 		$prop->setComment(Helpers::unformatDocComment($from->getDocComment()));
 		return $prop;
 	}
-
 }
diff --git a/src/PhpGenerator/GlobalFunction.php b/src/PhpGenerator/GlobalFunction.php
@@ -45,5 +45,4 @@ public function __toString()
 			. $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
@@ -280,5 +280,4 @@ public static function extractShortName($name)
 	{
 		return ($pos = strrpos($name, '\\')) === FALSE ? $name : substr($name, $pos + 1);
 	}
-
 }
diff --git a/src/PhpGenerator/Method.php b/src/PhpGenerator/Method.php
@@ -161,5 +161,4 @@ public function isAbstract()
 	{
 		return $this->abstract;
 	}
-
 }
diff --git a/src/PhpGenerator/Parameter.php b/src/PhpGenerator/Parameter.php
@@ -152,5 +152,4 @@ public function hasDefaultValue()
 	{
 		return $this->hasDefaultValue;
 	}
-
 }
diff --git a/src/PhpGenerator/PhpFile.php b/src/PhpGenerator/PhpFile.php
@@ -92,5 +92,4 @@ public function __toString()
 			. implode("\n\n", $this->namespaces)
 		) . "\n";
 	}
-
 }
diff --git a/src/PhpGenerator/PhpLiteral.php b/src/PhpGenerator/PhpLiteral.php
@@ -33,5 +33,4 @@ public function __toString()
 	{
 		return $this->value;
 	}
-
 }
diff --git a/src/PhpGenerator/PhpNamespace.php b/src/PhpGenerator/PhpNamespace.php
@@ -242,5 +242,4 @@ public function __toString()
 				. $body;
 		}
 	}
-
 }
diff --git a/src/PhpGenerator/Property.php b/src/PhpGenerator/Property.php
@@ -75,5 +75,4 @@ public function isStatic()
 	{
 		return $this->static;
 	}
-
 }
diff --git a/src/PhpGenerator/Traits/CommentAware.php b/src/PhpGenerator/Traits/CommentAware.php
@@ -70,5 +70,4 @@ public function addDocument($s)
 		trigger_error(__METHOD__ . '() is deprecated, use addComment()', E_USER_DEPRECATED);
 		return $this->addComment($s);
 	}
-
 }
diff --git a/src/PhpGenerator/Traits/FunctionLike.php b/src/PhpGenerator/Traits/FunctionLike.php
@@ -229,5 +229,4 @@ protected function returnTypeToString()
 			? ': ' . ($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
@@ -47,5 +47,4 @@ public function getName()
 	{
 		return $this->name;
 	}
-
 }
diff --git a/src/PhpGenerator/Traits/VisibilityAware.php b/src/PhpGenerator/Traits/VisibilityAware.php
@@ -40,5 +40,4 @@ public function getVisibility()
 	{
 		return $this->visibility;
 	}
-
 }
diff --git a/tests/PhpGenerator/ClassType.from.php7.phpt b/tests/PhpGenerator/ClassType.from.php7.phpt
@@ -14,19 +14,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.php7.expect', implode("\n", $res));
diff --git a/tests/PhpGenerator/ClassType.from.php71.phpt b/tests/PhpGenerator/ClassType.from.php71.phpt
@@ -14,11 +14,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
+	{
+	}
 }
 
 
diff --git a/tests/PhpGenerator/ClassType.from.phpt b/tests/PhpGenerator/ClassType.from.phpt
@@ -30,7 +30,9 @@ abstract class Class1 implements Interface1
 {
 	/** @return Class1 */
 	function func1()
-	{}
+	{
+	}
+
 
 	abstract protected function func2();
 }
@@ -50,15 +52,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
@@ -17,13 +17,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
@@ -1,7 +1,6 @@
 <?php
 
 use Nette\PhpGenerator\ClassType;
-use ReflectionClass;
 use Tester\Assert;
 
 
@@ -14,6 +13,7 @@ class A
 	protected $b;
 	private $c;
 
+
 	function foo()
 	{
 	}
@@ -26,6 +26,7 @@ class B extends A
 	protected $e;
 	private $f;
 
+
 	function bar()
 	{
 		return 3;
diff --git a/tests/PhpGenerator/Factory.php7.phpt b/tests/PhpGenerator/Factory.php7.phpt
@@ -14,6 +14,7 @@ require __DIR__ . '/../bootstrap.php';
 
 $factory = new Factory;
 
-$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
@@ -8,9 +8,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().php7.phpt b/tests/PhpGenerator/Helpers.dump().php7.phpt
@@ -13,5 +13,6 @@ require __DIR__ . '/../bootstrap.php';
 
 
 Assert::exception(function () {
-	Helpers::dump(new class {});
+	Helpers::dump(new class {
+	});
 }, Nette\InvalidArgumentException::class, 'Cannot dump anonymous class.');
diff --git a/tests/PhpGenerator/Helpers.dump().phpt b/tests/PhpGenerator/Helpers.dump().phpt
@@ -60,11 +60,13 @@ class Test2 extends Test
 	private $c = 4;
 	public $d = 5;
 
+
 	function __sleep()
 	{
 		return ['c', 'b', 'a'];
 	}
 
+
 	function __wakeup()
 	{
 	}
@@ -78,11 +80,13 @@ class Test3 implements Serializable
 {
 	private $a;
 
+
 	function serialize()
 	{
 		return '';
 	}
 
+
 	function unserialize($s)
 	{
 	}
@@ -98,7 +102,8 @@ Assert::exception(function () {
 
 
 class TestDateTime extends DateTime
-{}
+{
+}
 
 Assert::same(
 	"new DateTime('2016-06-22 20:52:43.123400', new DateTimeZone('Europe/Prague'))",
diff --git a/tests/PhpGenerator/Method.returnTypes.phpt b/tests/PhpGenerator/Method.returnTypes.phpt
@@ -7,7 +7,9 @@
 
 namespace A
 {
-	class Foo {}
+	class Foo
+	{
+	}
 }
 
 namespace
@@ -23,6 +25,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
@@ -6,7 +6,6 @@
  */
 
 use Nette\PhpGenerator\Method;
-use Nette\PhpGenerator\Parameter;
 use Tester\Assert;
 
 
@@ -18,6 +17,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
`@@ -507,5 +507,4 @@ private function validate(array $names)`
`507`	`507`	`}`
`508`	`508`	`}`
`509`	`509`	`}`
`510`		`-`
`511`	`510`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,5 +83,4 @@ public function addUse($name)`
`83`	`83`	`{`
`84`	`84`	`return $this->uses[] = new Parameter($name);`
`85`	`85`	`}`
`86`		`-`
`87`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,4 @@ public function getValue()`
`41`	`41`	`{`
`42`	`42`	`return $this->value;`
`43`	`43`	`}`
`44`		`-`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,5 +144,4 @@ public function fromPropertyReflection(\ReflectionProperty $from)`
`144`	`144`	`$prop->setComment(Helpers::unformatDocComment($from->getDocComment()));`
`145`	`145`	`return $prop;`
`146`	`146`	`}`
`147`		`-`
`148`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,4 @@ public function __toString()`
`45`	`45`	`. $this->returnTypeToString()`
`46`	`46`	`. "\n{\n" . Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1) . '}';`
`47`	`47`	`}`
`48`		`-`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -280,5 +280,4 @@ public static function extractShortName($name)`
`280`	`280`	`{`
`281`	`281`	`return ($pos = strrpos($name, '\\')) === FALSE ? $name : substr($name, $pos + 1);`
`282`	`282`	`}`
`283`		`-`
`284`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,5 +161,4 @@ public function isAbstract()`
`161`	`161`	`{`
`162`	`162`	`return $this->abstract;`
`163`	`163`	`}`
`164`		`-`
`165`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,5 +152,4 @@ public function hasDefaultValue()`
`152`	`152`	`{`
`153`	`153`	`return $this->hasDefaultValue;`
`154`	`154`	`}`
`155`		`-`
`156`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,5 +92,4 @@ public function __toString()`
`92`	`92`	`. implode("\n\n", $this->namespaces)`
`93`	`93`	`) . "\n";`
`94`	`94`	`}`
`95`		`-`
`96`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,4 @@ public function __toString()`
`33`	`33`	`{`
`34`	`34`	`return $this->value;`
`35`	`35`	`}`
`36`		`-`
`37`	`36`	`}`