Printer: print brace on next line when method/function has typehint

Author: dg

src/PhpGenerator/Printer.php

@@ -45,15 +45,17 @@ public function printFunction(GlobalFunction $function, ?PhpNamespace $namespace
 			. ($function->getReturnReference() ? '&' : '')
 			. $function->getName();
 		$returnType = $this->printReturnType($function);
+		$params = $this->printParameters($function, strlen($line) + strlen($returnType) + 2); // 2 = parentheses
 		$body = Helpers::simplifyTaggedNames($function->getBody(), $this->namespace);
 		$body = ltrim(rtrim(Strings::normalize($body)) . "\n");
+		$braceOnNextLine = $this->bracesOnNextLine && (!str_contains($params, "\n") || $returnType);
 
 		return $this->printDocComment($function)
 			. $this->printAttributes($function->getAttributes())
 			. $line
-			. $this->printParameters($function, strlen($line) + strlen($returnType) + 2) // 2 = parentheses
+			. $params
 			. $returnType
-			. ($this->bracesOnNextLine ? "\n" : ' ')
+			. ($braceOnNextLine ? "\n" : ' ')
 			. "{\n" . $this->indent($body) . "}\n";
 	}
 
@@ -117,7 +119,7 @@ public function printMethod(Method $method, ?PhpNamespace $namespace = null, boo
 		$params = $this->printParameters($method, strlen($line) + strlen($returnType) + strlen($this->indentation) + 2);
 		$body = Helpers::simplifyTaggedNames($method->getBody(), $this->namespace);
 		$body = ltrim(rtrim(Strings::normalize($body)) . "\n");
-		$braceOnNextLine = $this->bracesOnNextLine && !str_contains($params, "\n");
+		$braceOnNextLine = $this->bracesOnNextLine && (!str_contains($params, "\n") || $returnType);
 
 		return $this->printDocComment($method)
 			. $this->printAttributes($method->getAttributes())

tests/PhpGenerator/Printer.function.phpt

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\PhpGenerator\Printer;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$printer = new Printer;
+$function = new Nette\PhpGenerator\GlobalFunction('func');
+$function
+	->setReturnType('stdClass')
+	->setBody("func(); \r\nreturn 123;")
+	->addParameter('var')
+		->setType('stdClass');
+
+Assert::match(<<<'XX'
+	function func(stdClass $var): stdClass
+	{
+		func();
+		return 123;
+	}
+
+	XX, $printer->printFunction($function));
+
+
+$function = new Nette\PhpGenerator\GlobalFunction('multi');
+$function->addParameter('foo')
+		->addAttribute('Foo');
+
+Assert::match(<<<'XX'
+	function multi(
+		#[Foo] $foo,
+	) {
+	}
+
+	XX, $printer->printFunction($function));
+
+
+$function = new Nette\PhpGenerator\GlobalFunction('multiType');
+$function
+	->setReturnType('array')
+	->addParameter('foo')
+		->addAttribute('Foo');
+
+Assert::match(<<<'XX'
+	function multiType(
+		#[Foo] $foo,
+	): array
+	{
+	}
+
+	XX, $printer->printFunction($function));

tests/PhpGenerator/Printer.phpt

@@ -51,6 +51,15 @@ $class->addMethod('first')
 
 $class->addMethod('second');
 
+$method = $class->addMethod('multi')
+	->addParameter('foo')
+		->addAttribute('Foo');
+
+$method = $class->addMethod('multiType')
+	->setReturnType('array')
+	->addParameter('foo')
+		->addAttribute('Foo');
+
 
 sameFile(__DIR__ . '/expected/Printer.class.expect', $printer->printClass($class));
 sameFile(__DIR__ . '/expected/Printer.method.expect', $printer->printMethod($class->getMethod('first')));
@@ -63,17 +72,6 @@ sameFile(__DIR__ . '/expected/Printer.class-alt.expect', $printer->printClass($c
 
 
 
-$printer = new Printer;
-$function = new Nette\PhpGenerator\GlobalFunction('func');
-$function
-	->setReturnType('stdClass')
-	->setBody("func(); \r\nreturn 123;")
-	->addParameter('var')
-		->setType('stdClass');
-
-sameFile(__DIR__ . '/expected/Printer.function.expect', $printer->printFunction($function));
-
-
 $closure = new Nette\PhpGenerator\Closure;
 $closure
 	->setReturnType('stdClass')

tests/PhpGenerator/expected/PhpNamespace.expect

@@ -18,7 +18,8 @@ class A implements A, C
 		array $d,
 		?callable $e,
 		C|string $f,
-	): static|A {
+	): static|A
+	{
 	}
 }
 

tests/PhpGenerator/expected/Printer.class-alt.expect

@@ -60,4 +60,18 @@ final class Example extends ParentClass implements IExample
 
 	public function second() {
 	}
+
+
+
+	public function multi(
+		#[Foo] $foo,
+	) {
+	}
+
+
+
+	public function multiType(
+		#[Foo] $foo,
+	): array {
+	}
 }

tests/PhpGenerator/expected/Printer.class.expect

@@ -59,4 +59,17 @@ final class Example extends ParentClass implements IExample
 	public function second()
 	{
 	}
+
+
+	public function multi(
+		#[Foo] $foo,
+	) {
+	}
+
+
+	public function multiType(
+		#[Foo] $foo,
+	): array
+	{
+	}
 }