Printer: one-line properties without comments are not separated using one empty line

Author: dg

src/PhpGenerator/Printer.php

@@ -138,8 +138,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)),
-			implode("\n", $properties),
+			preg_replace('#^(\w.*\n)\n(?=\w.*;)#m', '$1', implode("\n", $consts)),
+			preg_replace('#^(\w.*\n)\n(?=\w.*;)#m', '$1', implode("\n", $properties)),
 			($methods && $properties ? str_repeat("\n", $this->linesBetweenMethods - 1) : '')
 			. implode(str_repeat("\n", $this->linesBetweenMethods), $methods),
 		]);

tests/PhpGenerator/expected/ClassType.expect

@@ -19,13 +19,9 @@ abstract class Example extends ParentClass implements IExample, IOne
 
 	/** @var resource  orignal file handle */
 	private $handle;
-
 	public $order = RecursiveIteratorIterator::SELF_FIRST;
-
 	public array $typed1;
-
 	public ?array $typed2 = null;
-
 	public static $sections = ['first' => true];
 
 

tests/PhpGenerator/expected/ClassType.from.74.expect

@@ -1,10 +1,7 @@
 class Class7
 {
 	public \A $a;
-
 	public ?\B $b;
-
 	public ?\C $c = null;
-
 	public ?int $i = 1;
 }

tests/PhpGenerator/expected/ClassType.from.anonymous.expect

@@ -1,6 +1,5 @@
 {
 	public $a;
-
 	private $b;
 
 

tests/PhpGenerator/expected/ClassType.from.expect

@@ -34,9 +34,7 @@ class Class2 extends Class1 implements Interface2
 
 	/** @var int */
 	protected $protected = 10;
-
 	private $private = [];
-
 	public static $static;
 
 

tests/PhpGenerator/expected/ClassType.inheritance.expect

@@ -1,9 +1,7 @@
 class B extends A implements I3
 {
 	public $d;
-
 	protected $e;
-
 	private $f;
 
 

tests/PhpGenerator/expected/Printer.class.expect

@@ -11,6 +11,7 @@ final class Example extends ParentClass implements IExample
 
 	/** Commented */
 	private const FORCE_ARRAY = Nette\Utils\Json::FORCE_ARRAY;
+
 	const MULTILINE_LONG = [
 		'aaaaaaaa' => 1,
 		'bbbbbbbb' => 2,
@@ -24,7 +25,6 @@ final class Example extends ParentClass implements IExample
 
 	/** @var resource  orignal file handle */
 	private $handle;
-
 	public $order = RecursiveIteratorIterator::SELF_FIRST;
 
 	public $multilineLong = [

tests/PhpGenerator/expected/PsrPrinter.class.expect

@@ -11,6 +11,7 @@ final class Example extends ParentClass implements IExample
 
     /** Commented */
     private const FORCE_ARRAY = Nette\Utils\Json::FORCE_ARRAY;
+
     const MULTILINE_LONG = [
         'aaaaaaaa' => 1,
         'bbbbbbbb' => 2,
@@ -24,7 +25,6 @@ final class Example extends ParentClass implements IExample
 
     /** @var resource  orignal file handle */
     private $handle;
-
     public $order = RecursiveIteratorIterator::SELF_FIRST;
 
     public $multilineLong = [