[ci-review] Rector Rectify

Author: actions-user

src/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php

@@ -7,7 +7,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
-use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\Type;
 use Rector\Php\PhpVersionProvider;
@@ -32,7 +31,7 @@ public function getNodeClass(): string
     /**
      * @param IntegerType $type
      */
-    public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
+    public function mapToPHPStanPhpDocTypeNode(Type $type): IdentifierTypeNode
     {
         // note: cannot be handled by PHPStan as uses explicit values
         return new IdentifierTypeNode('int');

src/PHPStanStaticTypeMapper/TypeMapper/ThisTypeMapper.php

@@ -4,7 +4,6 @@
 
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
-use PhpParser\Node;
 use PhpParser\Node\Name;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\ThisType;
@@ -32,7 +31,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
     /**
      * @param ThisType $type
      */
-    public function mapToPhpParserNode(Type $type, string $typeKind): Node
+    public function mapToPhpParserNode(Type $type, string $typeKind): Name
     {
         return new Name('self');
     }

src/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php

@@ -12,7 +12,6 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\UnionType as PhpParserUnionType;
-use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
@@ -55,7 +54,7 @@ public function getNodeClass(): string
     /**
      * @param UnionType $type
      */
-    public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
+    public function mapToPHPStanPhpDocTypeNode(Type $type): BracketsAwareUnionTypeNode
     {
         $unionTypesNodes = [];
         $existingTypes = [];

src/PhpAttribute/AnnotationToAttributeMapper/ArrayAnnotationToAttributeMapper.php

@@ -41,7 +41,7 @@ public function isCandidate(mixed $value): bool
     /**
      * @param mixed[] $value
      */
-    public function map($value): Expr
+    public function map($value): Array_
     {
         $arrayItems = [];
 

src/PhpAttribute/AnnotationToAttributeMapper/StringAnnotationToAttributeMapper.php

@@ -4,7 +4,6 @@
 
 namespace Rector\PhpAttribute\AnnotationToAttributeMapper;
 
-use PhpParser\Node\Expr;
 use PhpParser\Node\Scalar\String_;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpAttribute\Contract\AnnotationToAttributeMapperInterface;
@@ -22,7 +21,7 @@ public function isCandidate(mixed $value): bool
     /**
      * @param string $value
      */
-    public function map($value): Expr
+    public function map($value): String_
     {
         if (str_contains($value, "'") && ! str_contains($value, "\n")) {
             $kind = String_::KIND_DOUBLE_QUOTED;

src/PhpAttribute/AnnotationToAttributeMapper/StringNodeAnnotationToAttributeMapper.php

@@ -4,7 +4,6 @@
 
 namespace Rector\PhpAttribute\AnnotationToAttributeMapper;
 
-use PhpParser\Node\Expr;
 use PhpParser\Node\Scalar\String_;
 use Rector\BetterPhpDocParser\PhpDoc\StringNode;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -23,7 +22,7 @@ public function isCandidate(mixed $value): bool
     /**
      * @param StringNode $value
      */
-    public function map($value): Expr
+    public function map($value): String_
     {
         return new String_($value->value, [
             AttributeKey::KIND => $value->getAttribute(AttributeKey::KIND),

src/StaticTypeMapper/PhpParser/IntersectionTypeNodeMapper.php

@@ -8,7 +8,6 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PHPStan\Type\IntersectionType;
-use PHPStan\Type\Type;
 use Rector\StaticTypeMapper\Contract\PhpParser\PhpParserNodeMapperInterface;
 
 /**
@@ -31,7 +30,7 @@ public function getNodeType(): string
     /**
      * @param Node\IntersectionType $node
      */
-    public function mapToPHPStan(Node $node): Type
+    public function mapToPHPStan(Node $node): IntersectionType
     {
         $types = [];
         foreach ($node->types as $intersectionedType) {

src/StaticTypeMapper/PhpParser/StringNodeMapper.php

@@ -7,7 +7,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Type\StringType;
-use PHPStan\Type\Type;
 use Rector\StaticTypeMapper\Contract\PhpParser\PhpParserNodeMapperInterface;
 
 /**
@@ -23,7 +22,7 @@ public function getNodeType(): string
     /**
      * @param String_ $node
      */
-    public function mapToPHPStan(Node $node): Type
+    public function mapToPHPStan(Node $node): StringType
     {
         return new StringType();
     }