Printer: promoted parameters / parameter with attributes are always m…

…ultiline
nette · Mar 13, 2023 · cd40df5 · cd40df5
1 parent c4e433f
commit cd40df5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/src/PhpGenerator/Printer.php b/src/PhpGenerator/Printer.php
@@ -324,7 +324,7 @@ protected function printParameters(Closure|GlobalFunction|Method $function, int
 	{
 		$params = [];
 		$list = $function->getParameters();
-		$special = false;
+		$multiline = false;
 
 		foreach ($list as $param) {
 			$param->validate();
@@ -344,12 +344,13 @@ protected function printParameters(Closure|GlobalFunction|Method $function, int
 				. '$' . $param->getName()
 				. ($param->hasDefaultValue() && !$variadic ? ' = ' . $this->dump($param->getDefaultValue()) : '');
 
-			$special = $special || $promoted || $attrs;
+			$multiline = $multiline || $promoted || $attrs;
 		}
 
 		$line = implode(', ', $params);
+		$multiline = $multiline || count($params) > 1 && (strlen($line) + $column > $this->wrapLength);
 
-		return count($params) > 1 && ($special || strlen($line) + $column > $this->wrapLength)
+		return $multiline
 			? "(\n" . $this->indent(implode(",\n", $params)) . ",\n)"
 			: "($line)";
 	}

diff --git a/tests/PhpGenerator/expected/ClassType.attributes.expect b/tests/PhpGenerator/expected/ClassType.attributes.expect
@@ -20,7 +20,8 @@ class Example
 	 * Returns file handle.
 	 */
 	#[ExampleAttribute]
-	public function getHandle(#[ExampleAttribute, WithArguments(123)] $mode)
-	{
+	public function getHandle(
+		#[ExampleAttribute, WithArguments(123)] $mode,
+	) {
 	}
 }
diff --git a/tests/PhpGenerator/expected/ClassType.from.expect b/tests/PhpGenerator/expected/ClassType.from.expect
@@ -138,8 +138,9 @@ class Class9
 	 * Returns file handle
 	 */
 	#[ExampleAttribute]
-	public function getHandle(#[WithArguments(123)] $mode)
-	{
+	public function getHandle(
+		#[WithArguments(123)] $mode,
+	) {
 	}
 }
 

diff --git a/tests/PhpGenerator/expected/Extractor.classes.81.expect b/tests/PhpGenerator/expected/Extractor.classes.81.expect
@@ -33,8 +33,9 @@ class Class12
 	private readonly string $bar;
 
 
-	public function __construct(private readonly string $foo)
-	{
+	public function __construct(
+		private readonly string $foo,
+	) {
 		$this->bar = "foobar";
 	}
 }
diff --git a/tests/PhpGenerator/expected/Extractor.classes.expect b/tests/PhpGenerator/expected/Extractor.classes.expect
@@ -148,8 +148,9 @@ class Class9
 	 * Returns file handle
 	 */
 	#[ExampleAttribute]
-	public function getHandle(#[WithArguments(123)] $mode)
-	{
+	public function getHandle(
+		#[WithArguments(123)] $mode,
+	) {
 	}
 }