Remove superfluous phpdoc tags

These just specify a type that is already specified as a real PHP
type.

.php-cs-fixer.dist.php

@@ -27,6 +27,10 @@
             'operators' => ['=' => null],
         ],
         'phpdoc_align' => ['align' => 'left'],
+        'phpdoc_trim' => true,
+        'no_empty_phpdoc' => true,
+        'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
+        'no_extra_blank_lines' => true,
     ])
     ->setFinder($finder)
 ;

lib/PhpParser/Builder/ClassConst.php

@@ -13,7 +13,6 @@
 use PhpParser\Node\Stmt;
 
 class ClassConst implements PhpParser\Builder {
-    /** @var int */
     protected int $flags = 0;
     /** @var array<string, mixed> */
     protected array $attributes = [];

lib/PhpParser/Builder/Class_.php

@@ -10,16 +10,11 @@
 use PhpParser\Node\Stmt;
 
 class Class_ extends Declaration {
-    /** @var string */
     protected string $name;
-
-    /** @var Name|null */
     protected ?Name $extends = null;
     /** @var list<Name> */
     protected array $implements = [];
-    /** @var int */
     protected int $flags = 0;
-
     /** @var list<Stmt\TraitUse> */
     protected array $uses = [];
     /** @var list<Stmt\ClassConst> */

lib/PhpParser/Builder/Enum_.php

@@ -10,9 +10,7 @@
 use PhpParser\Node\Stmt;
 
 class Enum_ extends Declaration {
-    /** @var string */
     protected string $name;
-    /** @var Identifier|null */
     protected ?Identifier $scalarType = null;
     /** @var list<Name> */
     protected array $implements = [];

lib/PhpParser/Builder/FunctionLike.php

@@ -6,7 +6,6 @@
 use PhpParser\Node;
 
 abstract class FunctionLike extends Declaration {
-    /** @var bool */
     protected bool $returnByRef = false;
     /** @var Node\Param[] */
     protected array $params = [];

lib/PhpParser/Builder/Function_.php

@@ -8,7 +8,6 @@
 use PhpParser\Node\Stmt;
 
 class Function_ extends FunctionLike {
-    /** @var string */
     protected string $name;
     /** @var list<Stmt> */
     protected array $stmts = [];

lib/PhpParser/Builder/Interface_.php

@@ -9,7 +9,6 @@
 use PhpParser\Node\Stmt;
 
 class Interface_ extends Declaration {
-    /** @var string */
     protected string $name;
     /** @var list<Name> */
     protected array $extends = [];

lib/PhpParser/Builder/Method.php

@@ -9,9 +9,8 @@
 use PhpParser\Node\Stmt;
 
 class Method extends FunctionLike {
-    /** @var string */
     protected string $name;
-    /** @var int */
+
     protected int $flags = 0;
 
     /** @var list<Stmt>|null */

lib/PhpParser/Builder/Namespace_.php

@@ -8,7 +8,6 @@
 use PhpParser\Node\Stmt;
 
 class Namespace_ extends Declaration {
-    /** @var Node\Name|null */
     private ?Node\Name $name;
     /** @var Stmt[] */
     private array $stmts = [];

lib/PhpParser/Builder/Param.php

@@ -8,17 +8,12 @@
 use PhpParser\Node;
 
 class Param implements PhpParser\Builder {
-    /** @var string */
     protected string $name;
-    /** @var Node\Expr|null */
     protected ?Node\Expr $default = null;
     /** @var Node\Identifier|Node\Name|Node\ComplexType|null */
     protected ?Node $type = null;
-    /** @var bool */
     protected bool $byRef = false;
-    /** @var int */
     protected int $flags = 0;
-    /** @var bool */
     protected bool $variadic = false;
     /** @var list<Node\AttributeGroup> */
     protected array $attributeGroups = [];

lib/PhpParser/Builder/Property.php

@@ -12,11 +12,10 @@
 use PhpParser\Node\ComplexType;
 
 class Property implements PhpParser\Builder {
-    /** @var string */
     protected string $name;
-    /** @var int */
+
     protected int $flags = 0;
-    /** @var Node\Expr|null */
+
     protected ?Node\Expr $default = null;
     /** @var array<string, mixed> */
     protected array $attributes = [];

lib/PhpParser/Builder/TraitUseAdaptation.php

@@ -13,15 +13,10 @@ class TraitUseAdaptation implements Builder {
     private const TYPE_ALIAS      = 1;
     private const TYPE_PRECEDENCE = 2;
 
-    /** @var int Type of building adaptation */
     protected int $type;
-    /** @var Node\Name|null */
     protected ?Node\Name $trait;
-    /** @var Node\Identifier */
     protected Node\Identifier $method;
-    /** @var int|null */
     protected ?int $modifier = null;
-    /** @var Node\Identifier|null */
     protected ?Node\Identifier $alias = null;
     /** @var Node\Name[] */
     protected array $insteadof = [];

lib/PhpParser/Builder/Trait_.php

@@ -8,7 +8,6 @@
 use PhpParser\Node\Stmt;
 
 class Trait_ extends Declaration {
-    /** @var string */
     protected string $name;
     /** @var list<Stmt\TraitUse> */
     protected array $uses = [];

lib/PhpParser/Builder/Use_.php

@@ -8,11 +8,9 @@
 use PhpParser\Node\Stmt;
 
 class Use_ implements Builder {
-    /** @var Node\Name */
     protected Node\Name $name;
     /** @var Stmt\Use_::TYPE_* */
     protected int $type;
-    /** @var string|null */
     protected ?string $alias = null;
 
     /**

lib/PhpParser/BuilderFactory.php

@@ -16,8 +16,6 @@ class BuilderFactory {
      *
      * @param string|Name $name Name of the attribute
      * @param array $args Attribute named arguments
-     *
-     * @return Node\Attribute
      */
     public function attribute($name, array $args = []): Node\Attribute {
         return new Node\Attribute(
@@ -213,8 +211,6 @@ public function enumCase($name): Builder\EnumCase {
      * Creates node a for a literal value.
      *
      * @param Expr|bool|null|int|float|string|array $value $value
-     *
-     * @return Expr
      */
     public function val($value): Expr {
         return BuilderHelpers::normalizeValue($value);
@@ -224,8 +220,6 @@ public function val($value): Expr {
      * Creates variable node.
      *
      * @param string|Expr $name Name
-     *
-     * @return Expr\Variable
      */
     public function var($name): Expr\Variable {
         if (!\is_string($name) && !$name instanceof Expr) {
@@ -263,8 +257,6 @@ public function args(array $args): array {
      *
      * @param string|Name|Expr $name Function name
      * @param array $args Function arguments
-     *
-     * @return Expr\FuncCall
      */
     public function funcCall($name, array $args = []): Expr\FuncCall {
         return new Expr\FuncCall(
@@ -279,8 +271,6 @@ public function funcCall($name, array $args = []): Expr\FuncCall {
      * @param Expr $var Variable the method is called on
      * @param string|Identifier|Expr $name Method name
      * @param array $args Method arguments
-     *
-     * @return Expr\MethodCall
      */
     public function methodCall(Expr $var, $name, array $args = []): Expr\MethodCall {
         return new Expr\MethodCall(
@@ -296,8 +286,6 @@ public function methodCall(Expr $var, $name, array $args = []): Expr\MethodCall
      * @param string|Name|Expr $class Class name
      * @param string|Identifier|Expr $name Method name
      * @param array $args Method arguments
-     *
-     * @return Expr\StaticCall
      */
     public function staticCall($class, $name, array $args = []): Expr\StaticCall {
         return new Expr\StaticCall(
@@ -312,8 +300,6 @@ public function staticCall($class, $name, array $args = []): Expr\StaticCall {
      *
      * @param string|Name|Expr $class Class name
      * @param array $args Constructor arguments
-     *
-     * @return Expr\New_
      */
     public function new($class, array $args = []): Expr\New_ {
         return new Expr\New_(
@@ -326,8 +312,6 @@ public function new($class, array $args = []): Expr\New_ {
      * Creates a constant fetch node.
      *
      * @param string|Name $name Constant name
-     *
-     * @return Expr\ConstFetch
      */
     public function constFetch($name): Expr\ConstFetch {
         return new Expr\ConstFetch(BuilderHelpers::normalizeName($name));
@@ -338,8 +322,6 @@ public function constFetch($name): Expr\ConstFetch {
      *
      * @param Expr $var Variable holding object
      * @param string|Identifier|Expr $name Property name
-     *
-     * @return Expr\PropertyFetch
      */
     public function propertyFetch(Expr $var, $name): Expr\PropertyFetch {
         return new Expr\PropertyFetch($var, BuilderHelpers::normalizeIdentifierOrExpr($name));
@@ -350,8 +332,6 @@ public function propertyFetch(Expr $var, $name): Expr\PropertyFetch {
      *
      * @param string|Name|Expr $class Class name
      * @param string|Identifier|Expr $name Constant name
-     *
-     * @return Expr\ClassConstFetch
      */
     public function classConstFetch($class, $name): Expr\ClassConstFetch {
         return new Expr\ClassConstFetch(
@@ -364,8 +344,6 @@ public function classConstFetch($class, $name): Expr\ClassConstFetch {
      * Creates nested Concat nodes from a list of expressions.
      *
      * @param Expr|string ...$exprs Expressions or literal strings
-     *
-     * @return Concat
      */
     public function concat(...$exprs): Concat {
         $numExprs = count($exprs);
@@ -382,7 +360,6 @@ public function concat(...$exprs): Concat {
 
     /**
      * @param string|Expr $expr
-     * @return Expr
      */
     private function normalizeStringExpr($expr): Expr {
         if ($expr instanceof Expr) {

lib/PhpParser/Comment.php

@@ -3,19 +3,12 @@
 namespace PhpParser;
 
 class Comment implements \JsonSerializable {
-    /** @var string string */
     protected string $text;
-    /** @var int */
     protected int $startLine;
-    /** @var int */
     protected int $startFilePos;
-    /** @var int */
     protected int $startTokenPos;
-    /** @var int */
     protected int $endLine;
-    /** @var int */
     protected int $endFilePos;
-    /** @var int */
     protected int $endTokenPos;
 
     /**
@@ -121,8 +114,6 @@ public function __toString(): string {
      * on all subsequent lines.
      *
      * Additionally, this normalizes CRLF newlines to LF newlines.
-     *
-     * @return string
      */
     public function getReformattedText(): string {
         $text = str_replace("\r\n", "\n", $this->text);
@@ -196,8 +187,7 @@ private function getShortestWhitespacePrefixLen(string $str): int {
     }
 
     /**
-     * @return array
-     * @psalm-return array{nodeType:string, text:mixed, line:mixed, filePos:mixed}
+     * @return array{nodeType:string, text:mixed, line:mixed, filePos:mixed}
      */
     public function jsonSerialize(): array {
         // Technically not a node, but we make it look like one anyway

lib/PhpParser/Error.php

@@ -3,7 +3,6 @@
 namespace PhpParser;
 
 class Error extends \RuntimeException {
-    /** @var string */
     protected string $rawMessage;
     /** @var array<string, mixed> */
     protected array $attributes;
@@ -90,8 +89,6 @@ public function setStartLine(int $line): void {
      * Returns whether the error has start and end column information.
      *
      * For column information enable the startFilePos and endFilePos in the lexer options.
-     *
-     * @return bool
      */
     public function hasColumnInfo(): bool {
         return isset($this->attributes['startFilePos'], $this->attributes['endFilePos']);
@@ -101,7 +98,6 @@ public function hasColumnInfo(): bool {
      * Gets the start column (1-based) into the line where the error started.
      *
      * @param string $code Source code of the file
-     * @return int
      */
     public function getStartColumn(string $code): int {
         if (!$this->hasColumnInfo()) {
@@ -115,7 +111,6 @@ public function getStartColumn(string $code): int {
      * Gets the end column (1-based) into the line where the error ended.
      *
      * @param string $code Source code of the file
-     * @return int
      */
     public function getEndColumn(string $code): int {
         if (!$this->hasColumnInfo()) {

lib/PhpParser/ErrorHandler/Collecting.php

@@ -29,8 +29,6 @@ public function getErrors(): array {
 
     /**
      * Check whether there are any errors.
-     *
-     * @return bool
      */
     public function hasErrors(): bool {
         return !empty($this->errors);

lib/PhpParser/Internal/Differ.php

@@ -91,8 +91,6 @@ private function calculateTrace(array $old, array $new): array {
 
     /**
      * @param array<int, array<int, int>> $trace
-     * @param int $x
-     * @param int $y
      * @param T[] $old
      * @param T[] $new
      * @return DiffElem[]

lib/PhpParser/Internal/TokenStream.php

@@ -30,8 +30,6 @@ public function __construct(array $tokens) {
      *
      * @param int $startPos Start position
      * @param int $endPos End position
-     *
-     * @return bool
      */
     public function haveParens(int $startPos, int $endPos): bool {
         return $this->haveTokenImmediatelyBefore($startPos, '(')
@@ -43,8 +41,6 @@ public function haveParens(int $startPos, int $endPos): bool {
      *
      * @param int $startPos Start position
      * @param int $endPos End position
-     *
-     * @return bool
      */
     public function haveBraces(int $startPos, int $endPos): bool {
         return ($this->haveTokenImmediatelyBefore($startPos, '{')

lib/PhpParser/Lexer/Emulative.php

@@ -28,9 +28,8 @@ class Emulative extends Lexer {
     /** @var list<TokenEmulator> */
     private array $emulators = [];
 
-    /** @var PhpVersion */
     private PhpVersion $targetPhpVersion;
-    /** @var PhpVersion */
+
     private PhpVersion $hostPhpVersion;
 
     /**