Printer: added $linesBetweenProperties [Closes #60]

Author: dg

src/PhpGenerator/Printer.php

@@ -23,6 +23,9 @@ class Printer
 	/** @var string */
 	protected $indentation = "\t";
 
+	/** @var int */
+	protected $linesBetweenProperties = 0;
+
 	/** @var int */
 	protected $linesBetweenMethods = 2;
 
@@ -138,8 +141,8 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
 
 		$members = array_filter([
 			implode('', $traits),
-			preg_replace('#^(\w.*\n)\n(?=\w.*;)#m', '$1', implode("\n", $consts)),
-			preg_replace('#^(\w.*\n)\n(?=\w.*;)#m', '$1', implode("\n", $properties)),
+			$this->joinProperties($consts),
+			$this->joinProperties($properties),
 			($methods && $properties ? str_repeat("\n", $this->linesBetweenMethods - 1) : '')
 			. implode(str_repeat("\n", $this->linesBetweenMethods), $methods),
 		]);
@@ -278,4 +281,12 @@ private function printReturnType($function, ?PhpNamespace $namespace): string
 			? ': ' . $tmp
 			: '';
 	}
+
+
+	private function joinProperties(array $props)
+	{
+		return $this->linesBetweenProperties
+			? implode(str_repeat("\n", $this->linesBetweenProperties), $props)
+			: preg_replace('#^(\w.*\n)\n(?=\w.*;)#m', '$1', implode("\n", $props));
+	}
 }

tests/PhpGenerator/Printer.phpt

@@ -54,6 +54,14 @@ sameFile(__DIR__ . '/expected/Printer.class.expect', $printer->printClass($class
 sameFile(__DIR__ . '/expected/Printer.method.expect', $printer->printMethod($class->getMethod('first')));
 
 
+Assert::with($printer, function () {
+	$this->linesBetweenProperties = 1;
+	$this->linesBetweenMethods = 3;
+});
+sameFile(__DIR__ . '/expected/Printer.class-alt.expect', $printer->printClass($class));
+
+
+
 $function = new Nette\PhpGenerator\GlobalFunction('func');
 $function
 	->setReturnType('stdClass')

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

@@ -0,0 +1,65 @@
+/**
+ * Description of class.
+ * This is example
+ */
+final class Example extends ParentClass implements IExample
+{
+	use ObjectTrait;
+	use AnotherTrait {
+		sayHello as protected;
+	}
+
+	/** Commented */
+	private const FORCE_ARRAY = Nette\Utils\Json::FORCE_ARRAY;
+
+	const MULTILINE_LONG = [
+		'aaaaaaaa' => 1,
+		'bbbbbbbb' => 2,
+		'cccccccc' => 3,
+		'dddddddd' => 4,
+		'eeeeeeee' => 5,
+		'ffffffff' => 6,
+	];
+
+	const SHORT = ['aaaaaaaa' => 1, 'bbbbbbbb' => 2, 'cccccccc' => 3, 'dddddddd' => 4, 'eeeeeeee' => 5, 'ffffffff' => 6];
+
+	/** @var resource  orignal file handle */
+	private $handle;
+
+	public $order = RecursiveIteratorIterator::SELF_FIRST;
+
+	public $multilineLong = [
+		'aaaaaaaa' => 1,
+		'bbbbbbbb' => 2,
+		'cccccccc' => 3,
+		'dddddddd' => 4,
+		'eeeeeeee' => 5,
+		'ffffffff' => 6,
+	];
+
+	public $short = ['aaaaaaaa' => 1, 'bbbbbbbb' => 2, 'cccccccc' => 3, 'dddddddd' => 4, 'eeeeeeee' => 5, 'ffffffff' => 6];
+
+
+
+	/**
+	 * @return resource
+	 */
+	final public function first(stdClass $var): stdClass
+	{
+		func();
+		return [
+			'aaaaaaaaaaaa' => 1,
+			'bbbbbbbbbbb' => 2,
+			'cccccccccccccc' => 3,
+			'dddddddddddd' => 4,
+			'eeeeeeeeeeee' => 5,
+			'ffffffff' => 6,
+		];
+	}
+
+
+
+	public function second()
+	{
+	}
+}