Improve AnnotateThrowablesRector

docs/AllRectorsOverview.md

@@ -1,4 +1,4 @@
-# All 451 Rectors Overview
+# All 452 Rectors Overview
 
 - [Projects](#projects)
 - [General](#general)

packages/better-php-doc-parser/src/PhpDocInfo/PhpDocInfo.php

@@ -12,6 +12,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ThrowsTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Constant\ConstantArrayType;
@@ -188,6 +189,29 @@ public function getParamType(string $name): Type
         return $this->staticTypeMapper->mapPHPStanPhpDocTypeToPHPStanType($paramTagValue, $this->node);
     }
 
+    /**
+     * @return Type[]
+     */
+    public function getThrowsTypes(): array
+    {
+        $throwsPhpDocNodes = $this->getTagsByName('throws');
+
+        $throwsTypes = [];
+
+        foreach ($throwsPhpDocNodes as $throwsPhpDocNode) {
+            if (! $throwsPhpDocNode->value instanceof ThrowsTagValueNode) {
+                continue;
+            }
+
+            $throwsTypes[] = $this->staticTypeMapper->mapPHPStanPhpDocTypeToPHPStanType(
+                $throwsPhpDocNode->value,
+                $this->node
+            );
+        }
+
+        return $throwsTypes;
+    }
+
     /**
      * @return Type[]
      */

packages/static-type-mapper/src/PhpParser/IdentifierNodeMapper.php

@@ -7,7 +7,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use Rector\StaticTypeMapper\Contract\PhpParser\PhpParserNodeMapperInterface;
 use Rector\StaticTypeMapper\Mapper\ScalarStringToTypeMapper;
@@ -34,10 +33,6 @@ public function getNodeType(): string
      */
     public function mapToPHPStan(Node $node): Type
     {
-        if ($node->name === 'string') {
-            return new StringType();
-        }
-
         $type = $this->scalarStringToTypeMapper->mapScalarStringToType($node->name);
         if ($type !== null) {
             return $type;

packages/static-type-mapper/src/StaticTypeMapper.php

@@ -12,6 +12,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ThrowsTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Type;
@@ -93,7 +94,8 @@ public function mapPHPStanPhpDocTypeToPHPStanType(PhpDocTagValueNode $phpDocTagV
     {
         if ($phpDocTagValueNode instanceof ReturnTagValueNode ||
             $phpDocTagValueNode instanceof ParamTagValueNode ||
-            $phpDocTagValueNode instanceof VarTagValueNode
+            $phpDocTagValueNode instanceof VarTagValueNode ||
+            $phpDocTagValueNode instanceof ThrowsTagValueNode
         ) {
             return $this->mapPHPStanPhpDocTypeNodeToPHPStanType($phpDocTagValueNode->type, $node);
         }