coding style: fixes in code

Author: dg

src/PhpGenerator/Helpers.php

@@ -246,7 +246,7 @@ public static function isIdentifier($value)
 	 */
 	public static function isNamespaceIdentifier($value, $allowLeadingSlash = false)
 	{
-		$re = '#^' . ($allowLeadingSlash ? '\\\\?' : '') . Helpers::PHP_IDENT . '(\\\\' . Helpers::PHP_IDENT . ')*\z#';
+		$re = '#^' . ($allowLeadingSlash ? '\\\\?' : '') . self::PHP_IDENT . '(\\\\' . self::PHP_IDENT . ')*\z#';
 		return is_string($value) && preg_match($re, $value);
 	}
 

src/PhpGenerator/Parameter.php

@@ -18,6 +18,9 @@ class Parameter
 	use Nette\SmartObject;
 	use Traits\NameAware;
 
+	/** @var mixed */
+	public $defaultValue;
+
 	/** @var bool */
 	private $reference = false;
 
@@ -30,9 +33,6 @@ class Parameter
 	/** @var bool */
 	private $hasDefaultValue = false;
 
-	/** @var mixed */
-	public $defaultValue;
-
 
 	/**
 	 * @deprecated

tests/PhpGenerator/ClassType.from.php7.phpt

@@ -14,7 +14,7 @@ require __DIR__ . '/../bootstrap.php';
 
 abstract class Class1
 {
-	function func1()
+	public function func1()
 	{
 	}
 }
@@ -25,7 +25,7 @@ $res[] = ClassType::from(new class {
 	private $b;
 
 
-	function a()
+	public function a()
 	{
 	}
 
@@ -36,7 +36,7 @@ $res[] = ClassType::from(new class {
 });
 
 $res[] = ClassType::from(new class extends Class1 {
-	function a()
+	public function a()
 	{
 	}
 });

tests/PhpGenerator/ClassType.from.php71.phpt

@@ -14,17 +14,17 @@ 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 = [])
+	public function func1(A $a, ?B $b, ?C $c = null, D $d = null, E $e, ?int $i = 1, ?array $arr = [])
 	{
 	}
 
 
-	function func2(): ?stdClass
+	public function func2(): ?stdClass
 	{
 	}
 
 
-	function func3(): void
+	public function func3(): void
 	{
 	}
 }

tests/PhpGenerator/ClassType.from.phpt

@@ -19,7 +19,7 @@ require __DIR__ . '/../bootstrap.php';
  */
 interface Interface1
 {
-	function func1();
+	public function func1();
 }
 
 interface Interface2
@@ -29,7 +29,7 @@ interface Interface2
 abstract class Class1 implements Interface1
 {
 	/** @return Class1 */
-	function func1()
+	public function func1()
 	{
 	}
 
@@ -62,7 +62,7 @@ class Class2 extends Class1 implements Interface2
 	}
 
 
-	final function func2()
+	final public function func2()
 	{
 	}
 }

tests/PhpGenerator/ClassType.inheritance.phpt

@@ -14,7 +14,7 @@ class A
 	private $c;
 
 
-	function foo()
+	public function foo()
 	{
 	}
 }
@@ -27,7 +27,7 @@ class B extends A
 	private $f;
 
 
-	function bar()
+	public function bar()
 	{
 		return 3;
 	}

tests/PhpGenerator/GlobalFunction.phpt

@@ -10,7 +10,7 @@ require __DIR__ . '/../bootstrap.php';
 /** global */
 function func(stdClass $a, $b = null)
 {
-};
+}
 
 
 $function = GlobalFunction::from('func');

tests/PhpGenerator/Helpers.comments.phpt

@@ -18,6 +18,6 @@ Assert::same("/**\n * A\n * B\n * C\n */\n", Helpers::formatDocComment("A\nB\nC\
 
 Assert::same('', Helpers::unformatDocComment(''));
 Assert::same('', Helpers::unformatDocComment("/**  */\n\r\t"));
-Assert::same('@var string', Helpers::unformatDocComment(" /** @var string */ "));
+Assert::same('@var string', Helpers::unformatDocComment(' /** @var string */ '));
 Assert::same('@var string', Helpers::unformatDocComment("/**\n * @var string\n */"));
 Assert::same("A\nB\nC", Helpers::unformatDocComment("/**\n * A\n * B\n * C\n */\n"));

tests/PhpGenerator/Helpers.dump().phpt

@@ -33,7 +33,7 @@ Assert::same("'He\\llo'", Helpers::dump('He\llo'));
 Assert::same('\'He\ll\\\\\o \\\'wor\\\\\\\'ld\\\\\'', Helpers::dump('He\ll\\\o \'wor\\\'ld\\'));
 Assert::same('[]', Helpers::dump([]));
 
-Assert::same("[\$s]", Helpers::dump([new PhpLiteral('$s')]));
+Assert::same('[$s]', Helpers::dump([new PhpLiteral('$s')]));
 
 Assert::same('[1, 2, 3]', Helpers::dump([1, 2, 3]));
 Assert::same("['a', 7 => 'b', 'c', '9a' => 'd', 'e']", Helpers::dump(['a', 7 => 'b', 'c', '9a' => 'd', 9 => 'e']));
@@ -57,17 +57,17 @@ Assert::equal(new Test, eval('return ' . Helpers::dump(new Test) . ';'));
 
 class Test2 extends Test
 {
-	private $c = 4;
 	public $d = 5;
+	private $c = 4;
 
 
-	function __sleep()
+	public function __sleep()
 	{
 		return ['c', 'b', 'a'];
 	}
 
 
-	function __wakeup()
+	public function __wakeup()
 	{
 	}
 }
@@ -81,13 +81,13 @@ class Test3 implements Serializable
 	private $a;
 
 
-	function serialize()
+	public function serialize()
 	{
 		return '';
 	}
 
 
-	function unserialize($s)
+	public function unserialize($s)
 	{
 	}
 }

tests/PhpGenerator/Method.returnTypes.phpt

@@ -24,15 +24,15 @@ namespace
 
 	interface A
 	{
-		function testClass(): \A\Foo;
+		public function testClass(): \A\Foo;
 
-		function testScalar(): string;
+		public function testScalar(): string;
 	}
 
-	$method = Method::from(A::class .'::testClass');
+	$method = Method::from(A::class . '::testClass');
 	Assert::same('A\Foo', $method->getReturnType());
 
-	$method = Method::from(A::class .'::testScalar');
+	$method = Method::from(A::class . '::testScalar');
 	Assert::same('string', $method->getReturnType());
 
 	// generating methods with return type declarations