FunctionLike: chops parameters when are longer than WRAP_LENGTH [Closes

#28]
nette · Apr 26, 2018 · 8c19457 · 8c19457
1 parent 01ce200
commit 8c19457
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/src/PhpGenerator/Method.php b/src/PhpGenerator/Method.php
@@ -75,11 +75,14 @@ public function __toString()
 			. 'function '
 			. ($this->returnReference ? '&' : '')
 			. $this->name
-			. $this->parametersToString()
+			. ($params = $this->parametersToString())
 			. $this->returnTypeToString()
 			. ($this->abstract || $this->body === false
 				? ';'
-				: "\n{\n" . Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1) . '}');
+				: (strpos($params, "\n") === false ? "\n" : ' ')
+					. "{\n"
+					. Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1)
+					. '}');
 	}
 
 

diff --git a/src/PhpGenerator/Traits/FunctionLike.php b/src/PhpGenerator/Traits/FunctionLike.php
@@ -216,7 +216,10 @@ protected function parametersToString()
 				. '$' . $param->getName()
 				. ($param->hasDefaultValue() && !$variadic ? ' = ' . Helpers::dump($param->defaultValue) : '');
 		}
-		return '(' . implode(', ', $params) . ')';
+
+		return strlen($tmp = implode(', ', $params)) > Helpers::WRAP_LENGTH
+			? "(\n\t" . implode(",\n\t", $params) . "\n)"
+			: "($tmp)";
 	}
 
 

diff --git a/tests/PhpGenerator/Method.longParams.phpt b/tests/PhpGenerator/Method.longParams.phpt
@@ -0,0 +1,33 @@
+<?php
+
+use Nette\PhpGenerator\Method;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$method = (new Method('create'))
+	->setBody('return null;');
+
+for ($name = 'a'; $name < 'm'; $name++) {
+	$method->addParameter($name)->setTypeHint('string');
+}
+
+Assert::match(
+'function create(
+	string $a,
+	string $b,
+	string $c,
+	string $d,
+	string $e,
+	string $f,
+	string $g,
+	string $h,
+	string $i,
+	string $j,
+	string $k,
+	string $l
+) {
+	return null;
+}
+', (string) $method);