linting + stanning

Author: shmax

composer.json

@@ -14,7 +14,7 @@
 		"phpstan/phpstan-phpunit": "^1.1",
 		"phpstan/phpstan-strict-rules": "^1.0",
 		"phpunit/phpunit": "^9.5",
-		"symfony/process": "^5.2"
+		"symfony/process": "^5.2",
 	},
 	"config": {
 		"platform": {

src/Ast/Type/ArrayShapeNode.php

@@ -3,7 +3,8 @@
 namespace PHPStan\PhpDocParser\Ast\Type;
 
 use PHPStan\PhpDocParser\Ast\NodeAttributes;
-use function implode;
+use function array_filter;
+use function count;
 
 class ArrayShapeNode implements TypeNode
 {
@@ -13,7 +14,7 @@ class ArrayShapeNode implements TypeNode
 
 	use NodeAttributes;
 
-	/** @var ArrayShapeItemNode[] */
+	/** @var array<ArrayShapeItemNode|CommentNode|IdentifierTypeNode> */
 	public $items;
 
 	/** @var bool */
@@ -23,7 +24,7 @@ class ArrayShapeNode implements TypeNode
 	public $kind;
 
 	/**
-	 * @param ArrayShapeItemNode[] $items
+	 * @param array<ArrayShapeItemNode|CommentNode|IdentifierTypeNode> $items
 	 * @param self::KIND_* $kind
 	 */
 	public function __construct(array $items, bool $sealed = true, string $kind = self::KIND_ARRAY)
@@ -36,8 +37,11 @@ public function __construct(array $items, bool $sealed = true, string $kind = se
 	/**
 	 * @return array<ArrayShapeItemNode>
 	 */
-	public function items(): array {
-		return array_filter($this->items, function ($item) { return  $item instanceof ArrayShapeItemNode; });
+	public function items(): array
+	{
+		return array_filter($this->items, static function ($item) {
+			return $item instanceof ArrayShapeItemNode;
+		});
 	}
 
 	public function __toString(): string
@@ -49,17 +53,17 @@ public function __toString(): string
 		}
 
 		$res = $this->kind . '{';
-		foreach($items as $idx => $item) {
+		foreach ($items as $idx => $item) {
 			$res .= $item;
 
-			if($item instanceof ArrayShapeItemNode && $idx < count($items) - 1) {
-				$res .= ', ';
+			if (!($item instanceof ArrayShapeItemNode) || $idx >= count($items) - 1) {
+				continue;
 			}
 
-		}
-		$res .= '}';
+			$res .= ', ';
 
-		return $res;
+		}
+		return $res . '}';
 	}
 
 }

src/Parser/TokenIterator.php

@@ -242,7 +242,11 @@ public function joinUntil(int ...$tokenType): string
 	public function next(bool $skipIrrelevant = true): void
 	{
 		$this->index++;
-		$skipIrrelevant && $this->skipIrrelevantTokens();
+		if (!$skipIrrelevant) {
+			return;
+		}
+
+		$this->skipIrrelevantTokens();
 	}
 
 

src/Parser/TypeParser.php

@@ -752,11 +752,11 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 			$tokens->pushSavePoint();
 			$tokens->next();
 			$tab = "\t";
-			if($tokens->currentTokenType() == Lexer::TOKEN_CLOSE_CURLY_BRACKET) {
+			if ($tokens->currentTokenType() === Lexer::TOKEN_CLOSE_CURLY_BRACKET) {
 				$tab = '';
 			}
 			$tokens->rollback();
-			if($tokens->currentTokenType() == Lexer::TOKEN_PHPDOC_EOL) {
+			if ($tokens->currentTokenType() === Lexer::TOKEN_PHPDOC_EOL) {
 				$startLine = $tokens->currentTokenLine();
 				$startIndex = $tokens->currentTokenIndex();
 				$items[] = $this->enrichWithAttributes(
@@ -782,7 +782,7 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 				$items[] = $this->parseSimpleComment($tokens);
 			}
 
-			if($tokens->currentTokenType() == Lexer::TOKEN_PHPDOC_EOL) {
+			if ($tokens->currentTokenType() === Lexer::TOKEN_PHPDOC_EOL) {
 				$startLine = $tokens->currentTokenLine();
 				$startIndex = $tokens->currentTokenIndex();
 				$items[] = $this->enrichWithAttributes(
@@ -812,7 +812,7 @@ private function parseSimpleComment(TokenIterator $tokens): Ast\Type\CommentNode
 
 		$text = '';
 
-		while($tokens->currentTokenType() != Lexer::TOKEN_PHPDOC_EOL) {
+		while ($tokens->currentTokenType() !== Lexer::TOKEN_PHPDOC_EOL) {
 			$text .= $tokens->currentTokenValue();
 			$tokens->next(false);
 		}

src/Printer/Printer.php

@@ -339,7 +339,7 @@ private function printTagValue(PhpDocTagValueNode $node): string
 	private function printType(TypeNode $node): string
 	{
 		if ($node instanceof ArrayShapeNode) {
-			return (string)$node;
+			return (string) $node;
 		}
 		if ($node instanceof ArrayShapeItemNode) {
 			if ($node->keyName !== null) {