added PsrPrinter, compatible with PSR-2 and PSR-12 [Closes #30]

Author: dg

readme.md

@@ -154,18 +154,20 @@ class Demo
 Tabs versus spaces
 ------------------
 
-The generated code uses tabs for indentation, which makes it very easy to change it to any number of spaces:
+The generated code uses tabs for indentation. If you want to have the output compatible with PSR-2 or PSR-12, use `PsrPrinter`:
 
 ```php
-use Nette\PhpGenerator\Helpers;
+$printer = new Nette\PhpGenerator\PsrPrinter;
 
 $class = new Nette\PhpGenerator\ClassType('Demo');
 // ...
 
-echo Helpers::tabsToSpaces((string) $class); // 4 spaces indentation
-echo Helpers::tabsToSpaces((string) $class, 2); // 2 spaces indentation
+echo $printer->printClass($class); // 4 spaces indentation
 ```
 
+It can be used also for functions, closures, namespaces etc.
+
+
 Literals
 --------
 
@@ -259,6 +261,9 @@ $function->setBody('return $a + $b;');
 $function->addParameter('a');
 $function->addParameter('b');
 echo $function;
+
+// or use PsrPrinter for output compatible with PSR-2 / PSR-12
+// echo (new Nette\PhpGenerator\PsrPrinter)->printFunction($function);
 ```
 
 Result:
@@ -283,6 +288,9 @@ $closure->addParameter('b');
 $closure->addUse('c')
 	->setReference();
 echo $closure;
+
+// or use PsrPrinter for output compatible with PSR-2 / PSR-12
+// echo (new Nette\PhpGenerator\PsrPrinter)->printClosure($closure);
 ```
 
 Result:
@@ -372,6 +380,9 @@ $method->addParameter('arg')
 	->setTypeHint('Bar\OtherClass'); // resolves to \Bar\OtherClass
 
 echo $namespace;
+
+// or use PsrPrinter for output compatible with PSR-2 / PSR-12
+// echo (new Nette\PhpGenerator\PsrPrinter)->printNamespace($namespace);
 ```
 
 Result:
@@ -405,6 +416,9 @@ $class = $namespace->addClass('A');
 $class->addMethod('hello');
 
 echo $file;
+
+// or use PsrPrinter for output compatible with PSR-2 / PSR-12
+// echo (new Nette\PhpGenerator\PsrPrinter)->printFile($file);
 ```
 
 Result:

src/PhpGenerator/PsrPrinter.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\PhpGenerator;
+
+
+/**
+ * Generates PHP code compatible with PSR-2 and PSR-12.
+ */
+class PsrPrinter extends Printer
+{
+	/** @var string */
+	protected $indentation = '    ';
+
+	/** @var int */
+	protected $linesBetweenMethods = 1;
+}

tests/PhpGenerator/PsrPrinter.phpt

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\PhpGenerator\ClassType;
+use Nette\PhpGenerator\PhpLiteral;
+use Nette\PhpGenerator\PsrPrinter;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$printer = new PsrPrinter;
+
+
+$class = (new ClassType('Example'))
+	->setAbstract(true)
+	->setFinal(true)
+	->setExtends('ParentClass')
+	->addImplement('IExample')
+	->setTraits(['ObjectTrait'])
+	->addTrait('AnotherTrait', ['sayHello as protected'])
+	->addComment("Description of class.\nThis is example\n");
+
+$class->addConstant('FORCE_ARRAY', new PhpLiteral('Nette\Utils\Json::FORCE_ARRAY'))
+	->setVisibility('private')
+	->addComment('Commented');
+
+$class->addProperty('handle')
+	->setVisibility('private')
+	->addComment('@var resource  orignal file handle');
+
+$class->addProperty('order')
+	->setValue(new PhpLiteral('RecursiveIteratorIterator::SELF_FIRST'));
+
+$class->addMethod('first')
+	->addComment('@return resource')
+	->setFinal(true)
+	->setReturnType('stdClass')
+	->setBody('return $this->?;', ['handle'])
+	->addParameter('var')
+		->setTypeHint('stdClass');
+
+$class->addMethod('second');
+
+
+Assert::matchFile(__DIR__ . '/expected/PsrPrinter.class.expect', $printer->printClass($class));

tests/PhpGenerator/expected/PsrPrinter.class.expect

@@ -0,0 +1,31 @@
+/**
+ * Description of class.
+ * This is example
+ */
+abstract final class Example extends ParentClass implements IExample
+{
+    use ObjectTrait;
+    use AnotherTrait {
+        sayHello as protected;
+    }
+
+    /** Commented */
+    private const FORCE_ARRAY = Nette\Utils\Json::FORCE_ARRAY;
+
+    /** @var resource  orignal file handle */
+    private $handle;
+
+    public $order = RecursiveIteratorIterator::SELF_FIRST;
+
+    /**
+     * @return resource
+     */
+    final public function first(stdClass $var): stdClass
+    {
+        return $this->handle;
+    }
+
+    public function second()
+    {
+    }
+}