gossi / php-code-generator

src/model/PhpMethod.php

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
 		return new static($name);
 	}
 	
+	/**
+	 * @param string $name
+	 */
 	public function __construct($name) {
 		parent::__construct($name);
 		$this->initParameters();

src/parser/FileParser.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
 	private $visitors;
 	private $filename;
 	
+	/**
+	 * @param string $filename
+	 */
 	public function __construct($filename) {
 		$this->filename = $filename;
 		$this->visitors = new Set();

src/parser/visitor/parts/ValueParserPart.php

Doc Comments +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 	 * Returns whether this node is a boolean value
 	 * 
 	 * @param Node $node
-	 * @return bool
+	 * @return boolean|null
 	 */
 	private function isBool(Node $node) {
 		if ($node instanceof ConstFetch) {
@@ -91,7 +91,7 @@ 
 	 * Returns whether this node is a null value
 	 * 
 	 * @param Node $node
-	 * @return bool
+	 * @return boolean|null
 	 */
 	private function isNull(Node $node) {
 		if ($node instanceof ConstFetch) {
@@ -104,7 +104,7 @@ 
 	 * Returns the value from a node
 	 *
 	 * @param Node $node
-	 * @return mixed
+	 * @return string
 	 */
 	private function getExpression(Node $node) {
 		if ($node instanceof ConstFetch) {

Indentation +4 added lines, -4 removed lines

@@ -33,10 +33,10 @@
 			if ($this->isPrimitive($value)) {
 				$obj->setValue($this->getPrimitiveValue($value));
 			}
-            $expr = $this->getExpression($value);
-            if ($expr) {
-                $obj->setExpression($expr);
-            }
+			$expr = $this->getExpression($value);
+			if ($expr) {
+				$obj->setExpression($expr);
+			}
 		}
 	}
 

src/parser/PrettyPrinter.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
             }
 
 		  if ($prevNode && $prevNode->getLine() && $node->getLine()) {
-			  $diff = $node->getLine()- $prevNode->getLine();
+			  $diff = $node->getLine() - $prevNode->getLine();
 			  if ($diff > 0) {
 				  $result .= str_repeat("\n", $diff - 1);
 			  }

Indentation +25 added lines, -25 removed lines

@@ -9,26 +9,26 @@ 
 
 class PrettyPrinter extends Standard {
 
-    /**
-     * Pretty prints an array of nodes (statements) and indents them optionally.
-     *
-     * @param Node[] $nodes  Array of nodes
-     * @param bool   $indent Whether to indent the printed nodes
-     *
-     * @return string Pretty printed statements
-     */
-    protected function pStmts(array $nodes, bool $indent = true): string {
-        $result = '';
+	/**
+	 * Pretty prints an array of nodes (statements) and indents them optionally.
+	 *
+	 * @param Node[] $nodes  Array of nodes
+	 * @param bool   $indent Whether to indent the printed nodes
+	 *
+	 * @return string Pretty printed statements
+	 */
+	protected function pStmts(array $nodes, bool $indent = true): string {
+		$result = '';
 		$prevNode = null;
 
-        foreach ($nodes as $node) {
-            $comments = $node->getAttribute('comments', []);
-            if ($comments) {
-                $result .= "\n" . $this->pComments($comments);
-                if ($node instanceof Stmt\Nop) {
-                    continue;
-                }
-            }
+		foreach ($nodes as $node) {
+			$comments = $node->getAttribute('comments', []);
+			if ($comments) {
+				$result .= "\n" . $this->pComments($comments);
+				if ($node instanceof Stmt\Nop) {
+					continue;
+				}
+			}
 
 		  if ($prevNode && $prevNode->getLine() && $node->getLine()) {
 			  $diff = $node->getLine()- $prevNode->getLine();
@@ -37,16 +37,16 @@ 
 			  }
 		  }
 
-          $result .= "\n" . $this->p($node) . ($node instanceof Expr ? ';' : '');
+		  $result .= "\n" . $this->p($node) . ($node instanceof Expr ? ';' : '');
 		  $prevNode = $node;
-        }
+		}
 
 	   if ($indent) {
-            return preg_replace('~\n(?!$)~', "\n    ", $result);
-        } else {
-            return $result;
-        }
-    }
+			return preg_replace('~\n(?!$)~', "\n    ", $result);
+		} else {
+			return $result;
+		}
+	}
 
 	public function pExpr_Array(Array_ $node) {
 		return '[' . $this->pCommaSeparated($node->items) . ']';

src/generator/builder/parts/TypeBuilderPart.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
 	/**
 	 *
-	 * @param AbstractModel|TypePart $model
+	 * @param AbstractModel $model
 	 * @param bool $allowed
 	 *
 	 * @return string|null

Indentation +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
 		'string', 'int', 'integer', 'bool', 'boolean', 'float', 'double', 'object', 'mixed', 'resource'
 	];
 
-    protected static $php7typeHints = [
+	protected static $php7typeHints = [
 		'string', 'int', 'integer', 'bool', 'boolean', 'float', 'double'
 	];
 
@@ -36,15 +36,15 @@ 
 	private function getType(AbstractModel $model, bool $allowed, bool $nullable): ?string {
 		$types = $model->getTypes();
 		if (!$types || $types->size() !== 1) {
-		    return null;
-        }
+			return null;
+		}
 		$type = (string)$types->values()->toArray()[0];
 		if (!in_array($type, self::$noTypeHints, true)
-            || ($allowed && in_array($type, self::$php7typeHints, true))) {
+			|| ($allowed && in_array($type, self::$php7typeHints, true))) {
 
-            $type = self::$typeHintMap[$type] ?? $type;
+			$type = self::$typeHintMap[$type] ?? $type;
 
-            if ($nullable && $model->getNullable()) {
+			if ($nullable && $model->getNullable()) {
 				$type = '?' . $type;
 			}
 

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 		if (!$types || $types->size() !== 1) {
 		    return null;
         }
-		$type = (string)$types->values()->toArray()[0];
+		$type = (string) $types->values()->toArray()[0];
 		if (!in_array($type, self::$noTypeHints, true)
             || ($allowed && in_array($type, self::$php7typeHints, true))) {
 

src/model/PhpClass.php

Doc Comments -1 removed lines

@@ -79,7 +79,6 @@
 	/**
 	 * Sets the parent class name
 	 *
-	 * @param PhpClass|string|null $name the new parent
 	 * @return $this
 	 */
 	public function setParentClassName($parent) {

Indentation +9 added lines, -9 removed lines

@@ -71,10 +71,10 @@ 
 		return $this->parentClassName;
 	}
 
-    public function getParentClass(): PhpClass {
-	    return class_exists($this->parentClassName) ?
-            self::fromName($this->parentClassName) : PhpClass::create($this->parentClassName);
-    }
+	public function getParentClass(): PhpClass {
+		return class_exists($this->parentClassName) ?
+			self::fromName($this->parentClassName) : PhpClass::create($this->parentClassName);
+	}
 
 	/**
 	 * Sets the parent class name
@@ -84,12 +84,12 @@ 
 	 */
 	public function setParentClassName($parent) {
 		if ($parent instanceof PhpClass) {
-		    $this->addUseStatement($parent->getQualifiedName());
-		    $parent = $parent->getName();
-        }
-        $this->parentClassName = $parent;
+			$this->addUseStatement($parent->getQualifiedName());
+			$parent = $parent->getName();
+		}
+		$this->parentClassName = $parent;
 
-        return $this;
+		return $this;
 	}
 
 	public function generateDocblock(): void {

src/model/RoutineInterface.php

Doc Comments +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	 * A quick way to add a parameter which is created from the given parameters
 	 *
 	 * @param string      $name
-	 * @param string[]|PhpTypeInterface[] $types
+	 * @param string[]|PhpTypeInterface[] $type
 	 * @param mixed       $defaultValue omit the argument to define no default value
 	 *
 	 * @return $this
@@ -46,7 +46,7 @@ 
 	 * A quick way to add a parameter with description which is created from the given parameters
 	 *
 	 * @param string      $name
-	 * @param string[]|PhpTypeInterface[] $types
+	 * @param string[]|PhpTypeInterface[] $type
 	 * @param null|string $typeDescription
 	 * @param mixed       $defaultValue omit the argument to define no default value
 	 *
@@ -84,7 +84,7 @@ 
 	/**
 	 * Returns a collection of parameters
 	 *
-	 * @return array
+	 * @return PhpParameter[]
 	 */
 	public function getParameters();
 

src/utils/TypeUtils.php

Indentation +59 added lines, -59 removed lines

@@ -7,75 +7,75 @@
 
 class TypeUtils
 {
-    public static $phpTypes = [
-        'string',
-        'int',
-        'integer',
-        'bool',
-        'boolean',
-        'float',
-        'double',
-        'object',
-        'mixed',
-        'resource',
-        'iterable',
-        'array',
-        'callable',
-    ];
+	public static $phpTypes = [
+		'string',
+		'int',
+		'integer',
+		'bool',
+		'boolean',
+		'float',
+		'double',
+		'object',
+		'mixed',
+		'resource',
+		'iterable',
+		'array',
+		'callable',
+	];
 
-    public static function expressionToTypes(?string $typeExpression): array {
-        if (!$typeExpression) {
-            return [];
-        }
+	public static function expressionToTypes(?string $typeExpression): array {
+		if (!$typeExpression) {
+			return [];
+		}
 
-        return explode('|', $typeExpression);
-    }
+		return explode('|', $typeExpression);
+	}
 
-    public static function guessQualifiedName(AbstractPhpStruct $stuct, string $type): string {
-        if (in_array($type, self::$phpTypes, true)) {
-            return $type;
-        }
+	public static function guessQualifiedName(AbstractPhpStruct $stuct, string $type): string {
+		if (in_array($type, self::$phpTypes, true)) {
+			return $type;
+		}
 
-        $suffix = '';
-        if (strpos($type, '[]') !== false) {
-            $type = str_replace('[]', '', $type);
-            $suffix = '[]';
-        }
+		$suffix = '';
+		if (strpos($type, '[]') !== false) {
+			$type = str_replace('[]', '', $type);
+			$suffix = '[]';
+		}
 
-        $uses = $stuct->getUseStatements();
-        foreach ($uses as $use) {
-            $regexp = '/\\\\' . preg_quote($type, '/') . '$/';
-            if (preg_match($regexp, $use)) {
-                return $use . $suffix;
-            }
-        }
+		$uses = $stuct->getUseStatements();
+		foreach ($uses as $use) {
+			$regexp = '/\\\\' . preg_quote($type, '/') . '$/';
+			if (preg_match($regexp, $use)) {
+				return $use . $suffix;
+			}
+		}
 
-        $sameNamespace = $stuct->getNamespace() . '\\' . $type;
-        if (class_exists($sameNamespace)) {
-            return $sameNamespace . $suffix;
-        }
+		$sameNamespace = $stuct->getNamespace() . '\\' . $type;
+		if (class_exists($sameNamespace)) {
+			return $sameNamespace . $suffix;
+		}
 
-        return $type . $suffix;
-    }
+		return $type . $suffix;
+	}
 
-    public static function isGlobalQualifiedName(string $name): bool {
-        return $name[0] === '\\' && substr_count($name, '\\') === 1;
-    }
+	public static function isGlobalQualifiedName(string $name): bool {
+		return $name[0] === '\\' && substr_count($name, '\\') === 1;
+	}
 
-    public static function isNativeType(string $type): bool {
-        return in_array($type, self::$phpTypes, true);
-    }
+	public static function isNativeType(string $type): bool {
+		return in_array($type, self::$phpTypes, true);
+	}
 
-    public static function typesToExpression(iterable $types): ?string {
-        $typeExpr = '';
-        foreach ($types as $type) {
-            $typeExpr .= '|' . $type;
-        }
+	public static function typesToExpression(iterable $types): ?string {
+		$typeExpr = '';
+		foreach ($types as $type) {
+			$typeExpr .= '|' . $type;
+		}
 
-        if (!$typeExpr) {
-            return null;
-        }
+		if (!$typeExpr) {
+			return null;
+		}
 
-        return trim($typeExpr, '|');
-    }
+		return trim($typeExpr, '|');
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 
 use gossi\codegen\model\AbstractPhpStruct;
 
-class TypeUtils
-{
+class TypeUtils {
     public static $phpTypes = [
         'string',
         'int',

src/model/AbstractPhpStruct.php

Indentation +32 added lines, -32 removed lines

@@ -57,12 +57,12 @@ 
 		return new static($name);
 	}
 
-    public static function fromName(string $name): self
-    {
-        $ref = new \ReflectionClass($name);
+	public static function fromName(string $name): self
+	{
+		$ref = new \ReflectionClass($name);
 
-        return static::fromFile($ref->getFileName());
-    }
+		return static::fromFile($ref->getFileName());
+	}
 
 	/**
 	 * Creates a new struct
@@ -135,17 +135,17 @@ 
 	 * @return $this
 	 */
 	public function addUseStatement($qualifiedName, string $alias = null) {
-        if ($qualifiedName instanceof PhpTypeInterface) {
-            $qualifiedName = $qualifiedName->getQualifiedName();
-        }
+		if ($qualifiedName instanceof PhpTypeInterface) {
+			$qualifiedName = $qualifiedName->getQualifiedName();
+		}
 
-        if (TypeUtils::isGlobalQualifiedName($qualifiedName) || TypeUtils::isNativeType($qualifiedName)) {
-            return $this;
-        }
+		if (TypeUtils::isGlobalQualifiedName($qualifiedName) || TypeUtils::isNativeType($qualifiedName)) {
+			return $this;
+		}
 
-	    if ($qualifiedName === $this->getNamespace()) {
-	        return $this;
-        }
+		if ($qualifiedName === $this->getNamespace()) {
+			return $this;
+		}
 		if (!is_string($alias)) {
 			if (false === strpos($qualifiedName, '\\')) {
 				$alias = $qualifiedName;
@@ -271,24 +271,24 @@ 
 		$method->setParent($this);
 		$this->methods->set($method->getName(), $method);
 		$types = $method->getTypes();
-        if ($types) {
-            foreach ($types as $type) {
-                $this->addUseStatement($type);
-                $method->addType($type);
-            }
-        }
-
-        foreach ($method->getParameters() as $parameter) {
-            $types = $parameter->getTypes();
-            if ($types) {
-                foreach ($types as $type) {
-                    $this->addUseStatement($type);
-                    $parameter->addType($type);
-                }
-            }
-        }
-
-        return $this;
+		if ($types) {
+			foreach ($types as $type) {
+				$this->addUseStatement($type);
+				$method->addType($type);
+			}
+		}
+
+		foreach ($method->getParameters() as $parameter) {
+			$types = $parameter->getTypes();
+			if ($types) {
+				foreach ($types as $type) {
+					$this->addUseStatement($type);
+					$parameter->addType($type);
+				}
+			}
+		}
+
+		return $this;
 	}
 
 	/**