apply php-cs-fixer

Author: gossi

.php_cs

@@ -18,7 +18,9 @@ return PhpCsFixer\Config::create()
 			'syntax' => 'short'
 		],
 		'blank_line_after_namespace' => true,
-		'concat_space' => true,
+		'concat_space' => [
+			'spacing' => 'one'
+		],
 		'encoding' => true,
 		'full_opening_tag' => true,
 		'function_declaration' => [

src/config/CodeGeneratorConfig.php

@@ -143,8 +143,6 @@ public function setGenerateEmptyDocblock(bool $generate) {
 	public function getGenerateScalarTypeHints(): bool {
 		return $this->options['generateScalarTypeHints'];
 	}
-	
-	
 
 	/**
 	 * Returns whether sorting is enabled
@@ -230,7 +228,7 @@ public function setGenerateReturnTypeHints(bool $generate) {
 		$this->options['generateReturnTypeHints'] = $generate;
 		return $this;
 	}
-	
+
 	/**
 	 * Returns whether return nullable type hints will be generated (PHP 7.3)
 	 *
@@ -239,7 +237,7 @@ public function setGenerateReturnTypeHints(bool $generate) {
 	public function getGenerateNullableTypes(): bool {
 		return $this->options['generateNullableTypes'];
 	}
-	
+
 	/**
 	 * Sets whether return nullable type hints will be generated (PHP 7.3)
 	 *

src/generator/ComparatorFactory.php

@@ -70,4 +70,4 @@ public static function createMethodComparator(string $type): Comparator {
 // 		}
 		return new DefaultMethodComparator();
 	}
-}
+}

src/generator/ModelGenerator.php

@@ -23,7 +23,7 @@ class ModelGenerator {
 
 	/** @var CodeGeneratorConfig */
 	private $config;
-	
+
 	/** @var Formatter */
 	private $formatter;
 

src/generator/builder/AbstractBuilder.php

@@ -65,4 +65,4 @@ protected function buildDocblock(DocblockInterface $model): void {
 		}
 	}
 
-}
+}

src/generator/builder/ConstantBuilder.php

@@ -3,8 +3,8 @@
 
 namespace gossi\codegen\generator\builder;
 
-use gossi\codegen\model\AbstractModel;
 use gossi\codegen\generator\builder\parts\ValueBuilderPart;
+use gossi\codegen\model\AbstractModel;
 
 class ConstantBuilder extends AbstractBuilder {
 
@@ -17,4 +17,4 @@ public function build(AbstractModel $model): void {
 		$this->writer->writeln(';');
 	}
 
-}
+}

src/generator/builder/FunctionBuilder.php

@@ -17,4 +17,4 @@ public function build(AbstractModel $model): void {
 		$this->writeBody($model);
 	}
 
-}
+}

src/generator/builder/InterfaceBuilder.php

@@ -41,4 +41,4 @@ private function sort(PhpInterface $model) {
 		$this->sortConstants($model);
 		$this->sortMethods($model);
 	}
-}
+}

src/generator/builder/MethodBuilder.php

@@ -39,4 +39,4 @@ public function build(AbstractModel $model): void {
 		$this->writeBody($model);
 	}
 
-}
+}

src/generator/builder/ParameterBuilder.php

@@ -31,4 +31,4 @@ public function build(AbstractModel $model): void {
 		}
 	}
 
-}
+}

src/generator/builder/PropertyBuilder.php

@@ -3,8 +3,8 @@
 
 namespace gossi\codegen\generator\builder;
 
-use gossi\codegen\model\AbstractModel;
 use gossi\codegen\generator\builder\parts\ValueBuilderPart;
+use gossi\codegen\model\AbstractModel;
 
 class PropertyBuilder extends AbstractBuilder {
 
@@ -25,4 +25,4 @@ public function build(AbstractModel $model): void {
 		$this->writer->writeln(';');
 	}
 
-}
+}

src/generator/builder/TraitBuilder.php

@@ -3,8 +3,8 @@
 
 namespace gossi\codegen\generator\builder;
 
-use gossi\codegen\model\AbstractModel;
 use gossi\codegen\generator\builder\parts\StructBuilderPart;
+use gossi\codegen\model\AbstractModel;
 use gossi\codegen\model\PhpTrait;
 
 class TraitBuilder extends AbstractBuilder {
@@ -37,4 +37,4 @@ private function sort(PhpTrait $model) {
 		$this->sortProperties($model);
 		$this->sortMethods($model);
 	}
-}
+}

src/generator/builder/parts/RoutineBuilderPart.php

@@ -6,15 +6,15 @@
 use gossi\codegen\model\AbstractModel;
 use gossi\codegen\model\RoutineInterface;
 
-Trait RoutineBuilderPart {
+trait RoutineBuilderPart {
 
 	use TypeBuilderPart;
 
 	/**
 	 * @param AbstractModel $model
 	 * @return void
 	 */
-	protected abstract function generate(AbstractModel $model): void;
+	abstract protected function generate(AbstractModel $model): void;
 
 	protected function writeFunctionStatement(RoutineInterface $model): void {
 		$this->writer->write('function ');

src/generator/builder/parts/ValueBuilderPart.php

@@ -3,8 +3,8 @@
 
 namespace gossi\codegen\generator\builder\parts;
 
-use gossi\codegen\model\ValueInterface;
 use gossi\codegen\model\PhpConstant;
+use gossi\codegen\model\ValueInterface;
 
 trait ValueBuilderPart {
 
@@ -30,4 +30,4 @@ private function exportVar($value) {
 
 		return var_export($value, true);
 	}
-}
+}

src/generator/comparator/DefaultConstantComparator.php

@@ -27,4 +27,4 @@ public function compare($a, $b) {
 		return $this->comparator->compare($a->getName(), $b->getName());
 	}
 
-}
+}

src/generator/comparator/DefaultMethodComparator.php

@@ -32,4 +32,4 @@ public function compare($a, $b) {
 		return strcasecmp($a->getName(), $b->getName());
 	}
 
-}
+}

src/generator/comparator/DefaultPropertyComparator.php

@@ -28,4 +28,4 @@ public function compare($a, $b) {
 		return strcasecmp($a->getName(), $b->getName());
 	}
 
-}
+}

src/generator/comparator/DefaultUseStatementComparator.php

@@ -42,4 +42,4 @@ private function getAscii($str) {
 		return $ord;
 	}
 
-}
+}

src/model/PhpClass.php

@@ -38,8 +38,8 @@ class PhpClass extends AbstractPhpStruct implements GenerateableInterface, Trait
 	 * @param string $filename
 	 * @return PhpClass
 	 */
-	public static function fromFile(string $filename): PhpClass {
-		$class = new PhpClass();
+	public static function fromFile(string $filename): self {
+		$class = new self();
 		$parser = new FileParser($filename);
 		$parser->addVisitor(new ClassParserVisitor($class));
 		$parser->addVisitor(new MethodParserVisitor($class));
@@ -83,7 +83,7 @@ public function setParentClassName(?string $name) {
 		return $this;
 	}
 
-	public function generateDocblock() {
+	public function generateDocblock(): void {
 		parent::generateDocblock();
 
 		foreach ($this->constants as $constant) {

src/model/PhpConstant.php

@@ -59,7 +59,7 @@ public function __construct($name = null, $value = null, $isExpression = false)
 	/**
 	 * @inheritDoc
 	 */
-	public function generateDocblock() {
+	public function generateDocblock(): void {
 		$docblock = $this->getDocblock();
 		$docblock->setShortDescription($this->getDescription());
 		$docblock->setLongDescription($this->getLongDescription());

src/model/PhpFunction.php

@@ -98,7 +98,7 @@ public function __construct($name = null) {
 	/**
 	 * @inheritDoc
 	 */
-	public function generateDocblock() {
+	public function generateDocblock(): void {
 		$docblock = $this->getDocblock();
 		$docblock->setShortDescription($this->getDescription());
 		$docblock->setLongDescription($this->getLongDescription());

src/model/PhpInterface.php

@@ -26,8 +26,8 @@ class PhpInterface extends AbstractPhpStruct implements GenerateableInterface, C
 	 * @param string $filename
 	 * @return PhpInterface
 	 */
-	public static function fromFile(string $filename): PhpInterface {
-		$interface = new PhpInterface();
+	public static function fromFile(string $filename): self {
+		$interface = new self();
 		$parser = new FileParser($filename);
 		$parser->addVisitor(new InterfaceParserVisitor($interface));
 		$parser->addVisitor(new MethodParserVisitor($interface));
@@ -51,7 +51,7 @@ public function __construct($name = null) {
 	/**
 	 * @inheritDoc
 	 */
-	public function generateDocblock() {
+	public function generateDocblock(): void {
 		parent::generateDocblock();
 
 		foreach ($this->constants as $constant) {

src/model/PhpTrait.php

@@ -27,8 +27,8 @@ class PhpTrait extends AbstractPhpStruct implements GenerateableInterface, Trait
 	 * @param string $filename
 	 * @return PhpTrait
 	 */
-	public static function fromFile(string $filename): PhpTrait {
-		$trait = new PhpTrait();
+	public static function fromFile(string $filename): self {
+		$trait = new self();
 		$parser = new FileParser($filename);
 		$parser->addVisitor(new TraitParserVisitor($trait));
 		$parser->addVisitor(new MethodParserVisitor($trait));
@@ -52,7 +52,7 @@ public function __construct($name = null) {
 	/**
 	 * @inheritDoc
 	 */
-	public function generateDocblock() {
+	public function generateDocblock(): void {
 		parent::generateDocblock();
 
 		foreach ($this->properties as $prop) {

src/model/PropertiesInterface.php

@@ -70,4 +70,4 @@ public function getPropertyNames(): Set;
 	 * @return $this
 	 */
 	public function clearProperties();
-}
+}

src/model/ValueInterface.php

@@ -62,4 +62,4 @@ public function getExpression(): ?string;
 	 * @return $this
 	 */
 	public function unsetExpression();
-}
+}

src/model/parts/ParametersPart.php

@@ -4,8 +4,8 @@
 namespace gossi\codegen\model\parts;
 
 use gossi\codegen\model\PhpParameter;
-use gossi\docblock\tags\ParamTag;
 use gossi\docblock\Docblock;
+use gossi\docblock\tags\ParamTag;
 
 /**
  * Parameters Part

src/model/parts/TypeDocblockGeneratorPart.php

@@ -3,8 +3,8 @@
 
 namespace gossi\codegen\model\parts;
 
-use gossi\docblock\tags\AbstractTag;
 use gossi\docblock\Docblock;
+use gossi\docblock\tags\AbstractTag;
 
 /**
  * Type docblock generator part

src/model/parts/TypePart.php

@@ -17,7 +17,7 @@ trait TypePart {
 
 	/** @var string */
 	private $typeDescription;
-	
+
 	/** @var bool */
 	private $typeNullable;
 
@@ -65,7 +65,7 @@ public function getType(): ?string {
 	public function getTypeDescription(): ?string {
 		return $this->typeDescription;
 	}
-	
+
 	/**
 	 * Returns whether the type is nullable
 	 * 
@@ -74,7 +74,7 @@ public function getTypeDescription(): ?string {
 	public function getNullable(): bool {
 		return $this->typeNullable;
 	}
-	
+
 	/**
 	 * Sets the type nullable
 	 * 

src/model/parts/ValuePart.php

@@ -63,7 +63,7 @@ public function hasDefaultValue(): bool {
 	 * Returns whether the given value is a primitive
 	 *
 	 * @param mixed $value
-	 * @return boolean
+	 * @return bool
 	 */
 	private function isPrimitive($value): bool {
 		return (is_string($value)
@@ -77,7 +77,7 @@ private function isPrimitive($value): bool {
 	/**
 	 * Sets the value
 	 *
-	 * @param string|integer|float|bool|null|PhpConstant $value
+	 * @param string|int|float|bool|null|PhpConstant $value
 	 * @throws \InvalidArgumentException if the value is not an accepted primitve
 	 * @return $this
 	 */
@@ -106,7 +106,7 @@ public function unsetValue() {
 	/**
 	 * Returns the value
 	 *
-	 * @return string|integer|float|bool|null|PhpConstant
+	 * @return string|int|float|bool|null|PhpConstant
 	 */
 	public function getValue() {
 		return $this->value;

src/parser/FileParser.php

@@ -3,14 +3,14 @@
 
 namespace gossi\codegen\parser;
 
+use gossi\codegen\parser\visitor\ParserVisitorInterface;
+use phootwork\collection\Set;
+use phootwork\file\exception\FileNotFoundException;
+use phootwork\file\File;
 use PhpParser\Node;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitorAbstract;
 use PhpParser\Parser;
-use gossi\codegen\parser\visitor\ParserVisitorInterface;
-use phootwork\collection\Set;
-use phootwork\file\File;
-use phootwork\file\exception\FileNotFoundException;
 
 class FileParser extends NodeVisitorAbstract {