cs whitespace

Author: dg

src/PhpGenerator/Attribute.php

@@ -31,6 +31,7 @@ public function __construct(string $name, array $args)
 		if (!Helpers::isNamespaceIdentifier($name)) {
 			throw new Nette\InvalidArgumentException("Value '$name' is not valid attribute name.");
 		}
+
 		$this->name = $name;
 		$this->args = $args;
 	}

src/PhpGenerator/ClassType.php

@@ -138,6 +138,7 @@ public function __toString(): string
 			if (PHP_VERSION_ID >= 70400) {
 				throw $e;
 			}
+
 			trigger_error('Exception in ' . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
 			return '';
 		}
@@ -157,6 +158,7 @@ public function setName(?string $name): self
 		if ($name !== null && (!Helpers::isIdentifier($name) || isset(Helpers::KEYWORDS[strtolower($name)]))) {
 			throw new Nette\InvalidArgumentException("Value '$name' is not valid class name.");
 		}
+
 		$this->name = $name;
 		return $this;
 	}
@@ -222,6 +224,7 @@ public function setType(string $type): self
 		if (!in_array($type, [self::TYPE_CLASS, self::TYPE_INTERFACE, self::TYPE_TRAIT, self::TYPE_ENUM], true)) {
 			throw new Nette\InvalidArgumentException('Argument must be class|interface|trait|enum.');
 		}
+
 		$this->type = $type;
 		return $this;
 	}
@@ -270,6 +273,7 @@ public function setExtends($names): self
 		if (!is_string($names) && !is_array($names)) {
 			throw new Nette\InvalidArgumentException('Argument must be string or string[].');
 		}
+
 		$this->validateNames((array) $names);
 		$this->extends = $names;
 		return $this;
@@ -340,8 +344,10 @@ public function setTraits(array $traits): self
 			if (!$trait instanceof TraitUse) {
 				$trait = new TraitUse($trait);
 			}
+
 			$this->traits[$trait->getName()] = $trait;
 		}
+
 		return $this;
 	}
 
@@ -370,6 +376,7 @@ public function addTrait(string $name, $resolutions = [])
 		if ($resolutions === true) {
 			return $trait;
 		}
+
 		array_map(function ($item) use ($trait) {
 			$trait->addResolution($item);
 		}, $resolutions);
@@ -395,6 +402,7 @@ public function addMember($member): self
 			if ($this->isInterface()) {
 				$member->setBody(null);
 			}
+
 			$this->methods[strtolower($member->getName())] = $member;
 
 		} elseif ($member instanceof Property) {
@@ -428,8 +436,10 @@ public function setConstants(array $consts): self
 			if (!$const instanceof Constant) {
 				$const = (new Constant($k))->setValue($const)->setPublic();
 			}
+
 			$this->consts[$const->getName()] = $const;
 		}
+
 		return $this;
 	}
 
@@ -469,6 +479,7 @@ public function setCases(array $cases): self
 		foreach ($cases as $case) {
 			$this->cases[$case->getName()] = $case;
 		}
+
 		return $this;
 	}
 
@@ -507,6 +518,7 @@ public function setProperties(array $props): self
 		foreach ($props as $v) {
 			$this->properties[$v->getName()] = $v;
 		}
+
 		return $this;
 	}
 
@@ -523,6 +535,7 @@ public function getProperty(string $name): Property
 		if (!isset($this->properties[$name])) {
 			throw new Nette\InvalidArgumentException("Property '$name' not found.");
 		}
+
 		return $this->properties[$name];
 	}
 
@@ -566,6 +579,7 @@ public function setMethods(array $methods): self
 		foreach ($methods as $m) {
 			$this->methods[strtolower($m->getName())] = $m;
 		}
+
 		return $this;
 	}
 
@@ -577,6 +591,7 @@ public function getMethods(): array
 		foreach ($this->methods as $m) {
 			$res[$m->getName()] = $m;
 		}
+
 		return $res;
 	}
 
@@ -587,6 +602,7 @@ public function getMethod(string $name): Method
 		if (!$m) {
 			throw new Nette\InvalidArgumentException("Method '$name' not found.");
 		}
+
 		return $m;
 	}
 
@@ -599,6 +615,7 @@ public function addMethod(string $name): Method
 		} else {
 			$method->setPublic();
 		}
+
 		return $this->methods[strtolower($name)] = $method;
 	}
 

src/PhpGenerator/Closure.php

@@ -41,6 +41,7 @@ public function __toString(): string
 			if (PHP_VERSION_ID >= 70400) {
 				throw $e;
 			}
+
 			trigger_error('Exception in ' . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
 			return '';
 		}

src/PhpGenerator/Dumper.php

@@ -155,6 +155,7 @@ private function dumpObject($var, array $parents, int $level): string
 					? '\Closure::fromCallable(' . $this->dump($inner) . ')'
 					: implode('::', (array) $inner) . '(...)';
 			}
+
 			throw new Nette\InvalidArgumentException('Cannot dump closure.');
 		}
 
@@ -227,19 +228,23 @@ public function format(string $statement, ...$args): string
 				if (!is_array($arg)) {
 					throw new Nette\InvalidArgumentException('Argument must be an array.');
 				}
+
 				$res .= $this->dumpArguments($arg, strlen($res) - strrpos($res, "\n"), $token === '...?:');
 
 			} else { // $  ->  ::
 				$arg = array_shift($args);
 				if ($arg instanceof Literal || !Helpers::isIdentifier($arg)) {
 					$arg = '{' . $this->dumpVar($arg) . '}';
 				}
+
 				$res .= substr($token, 0, -1) . $arg;
 			}
 		}
+
 		if ($args) {
 			throw new Nette\InvalidArgumentException('Insufficient number of placeholders.');
 		}
+
 		return $res;
 	}
 

src/PhpGenerator/Extractor.php

@@ -34,6 +34,7 @@ public function __construct(string $code)
 		if (!class_exists(ParserFactory::class)) {
 			throw new Nette\NotSupportedException("PHP-Parser is required to load method bodies, install package 'nikic/php-parser' 4.7 or newer.");
 		}
+
 		$this->printer = new PhpParser\PrettyPrinter\Standard;
 		$this->parseCode($code);
 	}
@@ -44,6 +45,7 @@ private function parseCode(string $code): void
 		if (substr($code, 0, 5) !== '<?php') {
 			throw new Nette\InvalidStateException('The input string is not a PHP code.');
 		}
+
 		$this->code = str_replace("\r\n", "\n", $code);
 		$lexer = new PhpParser\Lexer\Emulative(['usedAttributes' => ['startFilePos', 'endFilePos', 'comments']]);
 		$parser = (new ParserFactory)->create(ParserFactory::ONLY_PHP7, $lexer);
@@ -71,6 +73,7 @@ public function extractMethodBodies(string $className): array
 				$res[$methodNode->name->toString()] = $this->getReformattedContents($methodNode->stmts, 2);
 			}
 		}
+
 		return $res;
 	}
 
@@ -111,7 +114,6 @@ private function prepareReplacements(array $statements): array
 						Helpers::tagName($node->toCodeString(), $of),
 					];
 				}
-
 			} elseif ($node instanceof Node\Scalar\String_ || $node instanceof Node\Scalar\EncapsedStringPart) {
 				// multi-line strings => singleline
 				$token = $this->getNodeContents($node);
@@ -123,7 +125,6 @@ private function prepareReplacements(array $statements): array
 						$quote . addcslashes($node->value, "\x00..\x1F") . $quote,
 					];
 				}
-
 			} elseif ($node instanceof Node\Scalar\Encapsed) {
 				// HEREDOC => "string"
 				if ($node->getAttribute('kind') === Node\Scalar\String_::KIND_HEREDOC) {
@@ -153,6 +154,7 @@ private function performReplacements(string $s, array $replacements): string
 		foreach ($replacements as [$start, $end, $replacement]) {
 			$s = substr_replace($s, $replacement, $start, $end - $start + 1);
 		}
+
 		return $s;
 	}
 
@@ -179,6 +181,7 @@ public function enterNode(Node $node)
 				if (!$node->name) {
 					return PhpParser\NodeTraverser::DONT_TRAVERSE_CHILDREN;
 				}
+
 				$class = $this->addClassToFile($phpFile, $node);
 			} elseif ($node instanceof Node\Stmt\Interface_) {
 				$class = $this->addInterfaceToFile($phpFile, $node);
@@ -199,6 +202,7 @@ public function enterNode(Node $node)
 			} elseif ($node instanceof Node\Stmt\EnumCase) {
 				$this->addEnumCaseToClass($class, $node);
 			}
+
 			if ($node instanceof Node\FunctionLike) {
 				return PhpParser\NodeTraverser::DONT_TRAVERSE_CHILDREN;
 			}
@@ -230,9 +234,11 @@ private function addClassToFile(PhpFile $phpFile, Node\Stmt\Class_ $node): Class
 		if ($node->extends) {
 			$class->setExtends($node->extends->toString());
 		}
+
 		foreach ($node->implements as $item) {
 			$class->addImplement($item->toString());
 		}
+
 		$class->setFinal($node->isFinal());
 		$class->setAbstract($node->isAbstract());
 		$this->addCommentAndAttributes($class, $node);
@@ -246,6 +252,7 @@ private function addInterfaceToFile(PhpFile $phpFile, Node\Stmt\Interface_ $node
 		foreach ($node->extends as $item) {
 			$class->addExtend($item->toString());
 		}
+
 		$this->addCommentAndAttributes($class, $node);
 		return $class;
 	}
@@ -265,6 +272,7 @@ private function addEnumToFile(PhpFile $phpFile, Node\Stmt\Enum_ $node): ClassTy
 		foreach ($node->implements as $item) {
 			$class->addImplement($item->toString());
 		}
+
 		$this->addCommentAndAttributes($class, $node);
 		return $class;
 	}
@@ -282,9 +290,11 @@ private function addTraitToClass(ClassType $class, Node\Stmt\TraitUse $node): vo
 		foreach ($node->traits as $item) {
 			$trait = $class->addTrait($item->toString(), true);
 		}
+
 		foreach ($node->adaptations as $item) {
 			$trait->addResolution(trim($this->toPhp($item), ';'));
 		}
+
 		$this->addCommentAndAttributes($trait, $node);
 	}
 
@@ -299,10 +309,12 @@ private function addPropertyToClass(ClassType $class, Node\Stmt\Property $node):
 			} elseif ($node->isProtected()) {
 				$prop->setProtected();
 			}
+
 			$prop->setType($node->type ? $this->toPhp($node->type) : null);
 			if ($item->default) {
 				$prop->setValue(new Literal($this->getReformattedContents([$item->default], 1)));
 			}
+
 			$prop->setReadOnly(method_exists($node, 'isReadonly') && $node->isReadonly());
 			$this->addCommentAndAttributes($prop, $node);
 		}
@@ -320,6 +332,7 @@ private function addMethodToClass(ClassType $class, Node\Stmt\ClassMethod $node)
 		} elseif ($node->isProtected()) {
 			$method->setProtected();
 		}
+
 		$this->setupFunction($method, $node);
 	}
 
@@ -334,6 +347,7 @@ private function addConstantToClass(ClassType $class, Node\Stmt\ClassConst $node
 			} elseif ($node->isProtected()) {
 				$const->setProtected();
 			}
+
 			$const->setFinal(method_exists($node, 'isFinal') && $node->isFinal());
 			$this->addCommentAndAttributes($const, $node);
 		}
@@ -366,6 +380,7 @@ private function addCommentAndAttributes($element, Node $node): void
 						$args[] = $value;
 					}
 				}
+
 				$element->addAttribute($attribute->name->toString(), $args);
 			}
 		}
@@ -387,8 +402,10 @@ private function setupFunction($function, Node\FunctionLike $node): void
 			if ($item->default) {
 				$param->setDefaultValue(new Literal($this->getReformattedContents([$item->default], 2)));
 			}
+
 			$this->addCommentAndAttributes($param, $item);
 		}
+
 		$this->addCommentAndAttributes($function, $node);
 		if ($node->stmts) {
 			$function->setBody($this->getReformattedContents($node->stmts, 2));