Printer: multiline attributes are in own attribute block

nette · Apr 26, 2023 · 210059d · 210059d
1 parent 8853465
commit 210059d
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/src/PhpGenerator/Printer.php b/src/PhpGenerator/Printer.php
@@ -425,6 +425,7 @@ protected function printAttributes(array $attrs, bool $inline = false): string
 			$args = $this->dumper->format('...?:', $attr->getArguments());
 			$args = Helpers::simplifyTaggedNames($args, $this->namespace);
 			$items[] = $this->printType($attr->getName(), nullable: false) . ($args ? "($args)" : '');
+			$inline = $inline && !str_contains($args, "\n");
 		}
 
 		return $inline

diff --git a/tests/PhpGenerator/Closure.phpt b/tests/PhpGenerator/Closure.phpt
@@ -84,3 +84,24 @@ same(
 		XX,
 	(string) $function,
 );
+
+
+
+$function = new Closure;
+$function->setBody('return $a + $b;');
+$function->addAttribute('Foo', ['a', str_repeat('b', 120)]);
+$function->addAttribute('Bar');
+
+same(
+	<<<'XX'
+		#[Foo(
+			'a',
+			'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+		)]
+		#[Bar]
+		function () {
+			return $a + $b;
+		}
+		XX,
+	(string) $function,
+);
diff --git a/tests/PhpGenerator/Printer.function.phpt b/tests/PhpGenerator/Printer.function.phpt
@@ -162,3 +162,22 @@ Assert::match(<<<'XX'
 	) {
 	}
 	XX, $printer->printFunction($function));
+
+
+// parameter: multiple & multiline
+$function = new GlobalFunction('func');
+$param = $function->addParameter('foo');
+$param->addAttribute('Bar');
+$param->addAttribute('Foo', ['a', str_repeat('x', 120)]);
+
+Assert::match(<<<'XX'
+	function func(
+		#[Bar]
+		#[Foo(
+			'a',
+			'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+		)]
+		$foo,
+	) {
+	}
+	XX, $printer->printFunction($function));