diff --git a/packages/better-php-doc-parser/src/Type/PreSlashStringType.php b/packages/better-php-doc-parser/src/Type/PreSlashStringType.php deleted file mode 100644 index c69ff7e4600..00000000000 --- a/packages/better-php-doc-parser/src/Type/PreSlashStringType.php +++ /dev/null @@ -1,16 +0,0 @@ -resolveFromFunctionDocBlock($node); } - private function resolveFromType(Node $node) + private function resolveFromType(Node $node): Type { if ($node->type !== null && ! $node->type instanceof Identifier) { $resolveTypeName = $this->nodeNameResolver->getName($node->type); diff --git a/packages/static-type-mapper/src/PhpDocParser/ArrayTypeMapper.php b/packages/static-type-mapper/src/PhpDocParser/ArrayTypeMapper.php index 1229791ef20..9b33550499f 100644 --- a/packages/static-type-mapper/src/PhpDocParser/ArrayTypeMapper.php +++ b/packages/static-type-mapper/src/PhpDocParser/ArrayTypeMapper.php @@ -41,7 +41,6 @@ final class ArrayTypeMapper implements PhpDocTypeMapperInterface { $nestedType = $this->phpDocTypeMapper->mapToPHPStanType($typeNode->type, $node, $nameScope); - // @todo improve for key! return new ArrayType(new MixedType(), $nestedType); } } diff --git a/packages/static-type-mapper/src/PhpDocParser/IdentifierTypeMapper.php b/packages/static-type-mapper/src/PhpDocParser/IdentifierTypeMapper.php index 31a14ee1759..bb4d8bf8dc4 100644 --- a/packages/static-type-mapper/src/PhpDocParser/IdentifierTypeMapper.php +++ b/packages/static-type-mapper/src/PhpDocParser/IdentifierTypeMapper.php @@ -16,6 +16,7 @@ use PHPStan\Type\StaticType; use PHPStan\Type\Type; use Rector\AttributeAwarePhpDoc\Ast\Type\AttributeAwareIdentifierTypeNode; use Rector\BetterPhpDocParser\Type\PreSlashStringType; +use Rector\Core\Exception\ShouldNotHappenException; use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\PHPStan\Type\ParentStaticType; use Rector\PHPStan\Type\SelfObjectType; @@ -60,11 +61,6 @@ final class IdentifierTypeMapper implements PhpDocTypeMapperInterface $loweredName = strtolower($typeNode->name); - // @todo for all scalars - if ($loweredName === '\string') { - return new PreSlashStringType(); - } - if ($loweredName === 'class-string') { return new ClassStringType(); } diff --git a/utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/CorrectSeeRectorTest.php b/utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/CorrectSeeRector.php similarity index 73% rename from utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/CorrectSeeRectorTest.php rename to utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/CorrectSeeRector.php index b7abd0cdd24..33f9acdb140 100644 --- a/utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/CorrectSeeRectorTest.php +++ b/utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/CorrectSeeRector.php @@ -6,6 +6,6 @@ namespace Rector\PHPStanExtensions\Tests\Rule\SeeAnnotationToTestRule; use PHPUnit\Framework\TestCase; -final class CorrectSeeRectorTest extends TestCase +final class CorrectSeeRector extends TestCase { } diff --git a/utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/Fixture/CorrectSeeRector.php b/utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/Fixture/CorrectSeeRector.php index 26849a5eae6..9f2e2c426ef 100644 --- a/utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/Fixture/CorrectSeeRector.php +++ b/utils/phpstan-extensions/tests/Rule/SeeAnnotationToTestRule/Fixture/CorrectSeeRector.php @@ -10,7 +10,7 @@ use Rector\Core\Rector\AbstractRector; use Rector\Core\RectorDefinition\RectorDefinition; /** - * @see \Rector\PHPStanExtensions\Tests\Rule\SeeAnnotationToTestRule\CorrectSeeRectorTest + * @see \Rector\PHPStanExtensions\Tests\Rule\SeeAnnotationToTestRule\CorrectSeeRector */ final class CorrectSeeRector extends AbstractRector implements PhpRectorInterface {