coding style

dg · dg · commit c0b51b61757d · 2023-09-26T14:20:26.000+02:00
diff --git a/src/PhpGenerator/Dumper.php b/src/PhpGenerator/Dumper.php
@@ -55,7 +55,7 @@ private function dumpVar(mixed &$var, array $parents = [], int $level = 0, int $
 			throw new Nette\InvalidArgumentException('Cannot dump resource.');
 
 		} else {
-			return var_export($var, true);
+			return var_export($var, return: true);
 		}
 	}
 
@@ -105,7 +105,7 @@ private function dumpArray(array &$var, array $parents, int $level, int $column)
 		if (empty($var)) {
 			return '[]';
 
-		} elseif ($level > $this->maxDepth || in_array($var, $parents, true)) {
+		} elseif ($level > $this->maxDepth || in_array($var, $parents, strict: true)) {
 			throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');
 		}
 
@@ -140,10 +140,10 @@ private function dumpObject(object $var, array $parents, int $level): string
 	{
 		$class = $var::class;
 
-		if (in_array($class, [\DateTime::class, \DateTimeImmutable::class], true)) {
+		if (in_array($class, [\DateTime::class, \DateTimeImmutable::class], strict: true)) {
 			return $this->format("new \\$class(?, new \\DateTimeZone(?))", $var->format('Y-m-d H:i:s.u'), $var->getTimeZone()->getName());
 
-		} elseif ($var instanceof \Serializable) { // deprecated
+		} elseif ($var instanceof \Serializable) {
 			return 'unserialize(' . $this->dumpString(serialize($var)) . ')';
 
 		} elseif ($var instanceof \UnitEnum) {
@@ -162,7 +162,7 @@ private function dumpObject(object $var, array $parents, int $level): string
 		} elseif ((new \ReflectionObject($var))->isAnonymous()) {
 			throw new Nette\InvalidArgumentException('Cannot dump anonymous class.');
 
-		} elseif ($level > $this->maxDepth || in_array($var, $parents, true)) {
+		} elseif ($level > $this->maxDepth || in_array($var, $parents, strict: true)) {
 			throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');
 		}
 
diff --git a/src/PhpGenerator/Extractor.php b/src/PhpGenerator/Extractor.php
@@ -295,7 +295,7 @@ private function addFunctionToFile(PhpFile $phpFile, Node\Stmt\Function_ $node):
 	private function addTraitToClass(ClassLike $class, Node\Stmt\TraitUse $node): void
 	{
 		foreach ($node->traits as $item) {
-			$trait = $class->addTrait($item->toString(), true);
+			$trait = $class->addTrait($item->toString());
 		}
 
 		foreach ($node->adaptations as $item) {
diff --git a/src/PhpGenerator/PhpNamespace.php b/src/PhpGenerator/PhpNamespace.php
@@ -103,7 +103,7 @@ public function getBracketedSyntax(): bool
 	public function addUse(string $name, ?string $alias = null, string $of = self::NameNormal): static
 	{
 		if (
-			!Helpers::isNamespaceIdentifier($name, true)
+			!Helpers::isNamespaceIdentifier($name, allowLeadingSlash: true)
 			|| (Helpers::isIdentifier($name) && isset(Helpers::Keywords[strtolower($name)]))
 		) {
 			throw new Nette\InvalidArgumentException("Value '$name' is not valid class/function/constant name.");
diff --git a/src/PhpGenerator/Printer.php b/src/PhpGenerator/Printer.php
@@ -335,13 +335,13 @@ protected function printParameters(Closure|GlobalFunction|Method $function, int
 		}
 
 		if (!$special || ($this->singleParameterOnOneLine && count($function->getParameters()) === 1)) {
-			$line = $this->formatParameters($function, false);
+			$line = $this->formatParameters($function, multiline: false);
 			if (!str_contains($line, "\n") && strlen($line) + $column <= $this->wrapLength) {
 				return $line;
 			}
 		}
 
-		return $this->formatParameters($function, true);
+		return $this->formatParameters($function, multiline: true);
 	}
 
 
diff --git a/src/PhpGenerator/TraitUse.php b/src/PhpGenerator/TraitUse.php
@@ -30,7 +30,7 @@ final class TraitUse
 
 	public function __construct(string $name, ?ClassLike $parent = null)
 	{
-		if (!Nette\PhpGenerator\Helpers::isNamespaceIdentifier($name, true)) {
+		if (!Nette\PhpGenerator\Helpers::isNamespaceIdentifier($name, allowLeadingSlash: true)) {
 			throw new Nette\InvalidArgumentException("Value '$name' is not valid trait name.");
 		}
 
diff --git a/src/PhpGenerator/Type.php b/src/PhpGenerator/Type.php
@@ -83,9 +83,9 @@ class Type
 	public const STATIC = self::Static;
 
 
-	public static function nullable(string $type, bool $state = true): string
+	public static function nullable(string $type, bool $nullable = true): string
 	{
-		return ($state ? '?' : '') . ltrim($type, '?');
+		return ($nullable ? '?' : '') . ltrim($type, '?');
 	}
 
 
diff --git a/tests/PhpGenerator/ClassType.from.bodies.phpt b/tests/PhpGenerator/ClassType.from.bodies.phpt
@@ -9,9 +9,11 @@ require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/fixtures/bodies.php';
 
 
-Assert::exception(function () {
-	ClassType::from(PDO::class, withBodies: true);
-}, Nette\InvalidStateException::class, 'Source code of PDO not found.');
+Assert::exception(
+	fn() => ClassType::from(PDO::class, withBodies: true),
+	Nette\InvalidStateException::class,
+	'Source code of PDO not found.',
+);
 
 
 Assert::exception(
diff --git a/tests/PhpGenerator/Helpers.comments.phpt b/tests/PhpGenerator/Helpers.comments.phpt
@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 Assert::same('', Helpers::formatDocComment(' '));
 Assert::same("/** @var string */\n", Helpers::formatDocComment('@var string'));
 Assert::same("/**\n * @var string\n */\n", Helpers::formatDocComment("@var string\n"));
-Assert::same("/**\n * @var string\n */\n", Helpers::formatDocComment('@var string', true));
+Assert::same("/**\n * @var string\n */\n", Helpers::formatDocComment('@var string', forceMultiLine: true));
 Assert::same("/**\n * A\n * B\n * C\n */\n", Helpers::formatDocComment("A\nB\nC\n"));
 Assert::same("/**\n * @var string\n */\n", Helpers::formatDocComment("@var string \r\n"));
 Assert::same("/**\n * A\n *\n * B\n */\n", Helpers::formatDocComment("A\n\nB"));
diff --git a/tests/PhpGenerator/Helpers.isNamespaceIdentifier.phpt b/tests/PhpGenerator/Helpers.isNamespaceIdentifier.phpt
@@ -17,5 +17,5 @@ Assert::false(Helpers::isNamespaceIdentifier('Item\\\\Item'));
 Assert::false(Helpers::isNamespaceIdentifier('\\Item'));
 Assert::false(Helpers::isNamespaceIdentifier('Item\\'));
 
-Assert::true(Helpers::isNamespaceIdentifier('\\Item', true));
-Assert::false(Helpers::isNamespaceIdentifier('Item\\', true));
+Assert::true(Helpers::isNamespaceIdentifier('\\Item', allowLeadingSlash: true));
+Assert::false(Helpers::isNamespaceIdentifier('Item\\', allowLeadingSlash: true));
diff --git a/tests/PhpGenerator/PhpNamespace.add.phpt b/tests/PhpGenerator/PhpNamespace.add.phpt
@@ -8,9 +8,11 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::exception(function () {
-	(new PhpNamespace('Foo'))->add(new ClassType);
-}, Nette\InvalidArgumentException::class, 'Class does not have a name.');
+Assert::exception(
+	fn() => (new PhpNamespace('Foo'))->add(new ClassType),
+	Nette\InvalidArgumentException::class,
+	'Class does not have a name.',
+);
 
 
 $namespace = (new PhpNamespace('Foo'))
@@ -40,10 +42,10 @@ Assert::same('X', $classB->getNamespace()->getName());
 
 
 // duplicity
-Assert::noError(function () use ($namespace, $classA) {
-	$namespace->add($classA);
-});
+Assert::noError(fn() => $namespace->add($classA));
 
-Assert::exception(function () use ($namespace) {
-	$namespace->add(new ClassType('a'));
-}, Nette\InvalidStateException::class, "Cannot add 'a', because it already exists.");
+Assert::exception(
+	fn() => $namespace->add(new ClassType('a')),
+	Nette\InvalidStateException::class,
+	"Cannot add 'a', because it already exists.",
+);
diff --git a/tests/PhpGenerator/Type.phpt b/tests/PhpGenerator/Type.phpt
@@ -10,8 +10,8 @@ require __DIR__ . '/../bootstrap.php';
 Assert::same('A|string', Type::union(A::class, Type::String));
 
 Assert::same('?A', Type::nullable(A::class));
-Assert::same('?A', Type::nullable(A::class, true));
-Assert::same('A', Type::nullable(A::class, false));
+Assert::same('?A', Type::nullable(A::class));
+Assert::same('A', Type::nullable(A::class, nullable: false));
 
-Assert::same('?A', Type::nullable('?A', true));
-Assert::same('A', Type::nullable('?A', false));
+Assert::same('?A', Type::nullable('?A'));
+Assert::same('A', Type::nullable('?A', nullable: false));

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ private function dumpVar(mixed &$var, array $parents = [], int $level = 0, int $`
`55`	`55`	`throw new Nette\InvalidArgumentException('Cannot dump resource.');`
`56`	`56`
`57`	`57`	`} else {`
`58`		`- return var_export($var, true);`
	`58`	`+ return var_export($var, return: true);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`@@ -105,7 +105,7 @@ private function dumpArray(array &$var, array $parents, int $level, int $column)`
`105`	`105`	`if (empty($var)) {`
`106`	`106`	`return '[]';`
`107`	`107`
`108`		`- } elseif ($level > $this->maxDepth \|\| in_array($var, $parents, true)) {`
	`108`	`+ } elseif ($level > $this->maxDepth \|\| in_array($var, $parents, strict: true)) {`
`109`	`109`	`throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');`
`110`	`110`	`}`
`111`	`111`
`@@ -140,10 +140,10 @@ private function dumpObject(object $var, array $parents, int $level): string`
`140`	`140`	`{`
`141`	`141`	`$class = $var::class;`
`142`	`142`
`143`		`- if (in_array($class, [\DateTime::class, \DateTimeImmutable::class], true)) {`
	`143`	`+ if (in_array($class, [\DateTime::class, \DateTimeImmutable::class], strict: true)) {`
`144`	`144`	`return $this->format("new \\$class(?, new \\DateTimeZone(?))", $var->format('Y-m-d H:i:s.u'), $var->getTimeZone()->getName());`
`145`	`145`
`146`		`- } elseif ($var instanceof \Serializable) { // deprecated`
	`146`	`+ } elseif ($var instanceof \Serializable) {`
`147`	`147`	`return 'unserialize(' . $this->dumpString(serialize($var)) . ')';`
`148`	`148`
`149`	`149`	`} elseif ($var instanceof \UnitEnum) {`
`@@ -162,7 +162,7 @@ private function dumpObject(object $var, array $parents, int $level): string`
`162`	`162`	`} elseif ((new \ReflectionObject($var))->isAnonymous()) {`
`163`	`163`	`throw new Nette\InvalidArgumentException('Cannot dump anonymous class.');`
`164`	`164`
`165`		`- } elseif ($level > $this->maxDepth \|\| in_array($var, $parents, true)) {`
	`165`	`+ } elseif ($level > $this->maxDepth \|\| in_array($var, $parents, strict: true)) {`
`166`	`166`	`throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ private function addFunctionToFile(PhpFile $phpFile, Node\Stmt\Function_ $node):`
`295`	`295`	`private function addTraitToClass(ClassLike $class, Node\Stmt\TraitUse $node): void`
`296`	`296`	`{`
`297`	`297`	`foreach ($node->traits as $item) {`
`298`		`- $trait = $class->addTrait($item->toString(), true);`
	`298`	`+ $trait = $class->addTrait($item->toString());`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`foreach ($node->adaptations as $item) {`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function getBracketedSyntax(): bool`
`103`	`103`	`public function addUse(string $name, ?string $alias = null, string $of = self::NameNormal): static`
`104`	`104`	`{`
`105`	`105`	`if (`
`106`		`- !Helpers::isNamespaceIdentifier($name, true)`
	`106`	`+ !Helpers::isNamespaceIdentifier($name, allowLeadingSlash: true)`
`107`	`107`	`\|\| (Helpers::isIdentifier($name) && isset(Helpers::Keywords[strtolower($name)]))`
`108`	`108`	`) {`
`109`	`109`	`throw new Nette\InvalidArgumentException("Value '$name' is not valid class/function/constant name.");`
Original file line number	Diff line number	Diff line change
`@@ -335,13 +335,13 @@ protected function printParameters(Closure\|GlobalFunction\|Method $function, int`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`if (!$special \|\| ($this->singleParameterOnOneLine && count($function->getParameters()) === 1)) {`
`338`		`- $line = $this->formatParameters($function, false);`
	`338`	`+ $line = $this->formatParameters($function, multiline: false);`
`339`	`339`	`if (!str_contains($line, "\n") && strlen($line) + $column <= $this->wrapLength) {`
`340`	`340`	`return $line;`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
`344`		`- return $this->formatParameters($function, true);`
	`344`	`+ return $this->formatParameters($function, multiline: true);`
`345`	`345`	`}`
`346`	`346`
`347`	`347`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ final class TraitUse`
`30`	`30`
`31`	`31`	`public function __construct(string $name, ?ClassLike $parent = null)`
`32`	`32`	`{`
`33`		`- if (!Nette\PhpGenerator\Helpers::isNamespaceIdentifier($name, true)) {`
	`33`	`+ if (!Nette\PhpGenerator\Helpers::isNamespaceIdentifier($name, allowLeadingSlash: true)) {`
`34`	`34`	`throw new Nette\InvalidArgumentException("Value '$name' is not valid trait name.");`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ class Type`
`83`	`83`	`public const STATIC = self::Static;`
`84`	`84`
`85`	`85`
`86`		`- public static function nullable(string $type, bool $state = true): string`
	`86`	`+ public static function nullable(string $type, bool $nullable = true): string`
`87`	`87`	`{`
`88`		`- return ($state ? '?' : '') . ltrim($type, '?');`
	`88`	`+ return ($nullable ? '?' : '') . ltrim($type, '?');`
`89`	`89`	`}`
`90`	`90`
`91`	`91`