octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-06 03:10:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit acb0b5d3ad760e7253fb6f49b4047ec6226384d4

Browse Source 
acb0b5d3ad [PHPStanStaticTypeMapper] Clean up UnionTypeMapper: remove unused TypeFactory usage (#5863)
This commit is contained in:
Tomas Votruba 2024-05-08 23:53:57 +00:00
parent 9da012cd97
commit ed1310b8dc
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'bb90e0bbafee5e47720d9fda8f7e46fad5bd90a2';
public const PACKAGE_VERSION = 'acb0b5d3ad760e7253fb6f49b4047ec6226384d4';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-05-08 21:03:45';
public const RELEASE_DATE = '2024-05-09 06:49:57';
/**
* @var int
*/

21
src/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
View File

@ -25,7 +25,6 @@ use PHPStan\Type\UnionType;
use PHPStan\Type\VoidType;
use Rector\BetterPhpDocParser\ValueObject\Type\BracketsAwareUnionTypeNode;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
use Rector\Php\PhpVersionProvider;
use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
@ -56,21 +55,15 @@ final class UnionTypeMapper implements TypeMapperInterface
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @readonly
* @var \Rector\NodeTypeResolver\PHPStan\Type\TypeFactory
*/
private $typeFactory;
/**
* @var \Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper
*/
private $phpStanStaticTypeMapper;
public function __construct(PhpVersionProvider $phpVersionProvider, UnionTypeAnalyzer $unionTypeAnalyzer, NodeNameResolver $nodeNameResolver, TypeFactory $typeFactory)
public function __construct(PhpVersionProvider $phpVersionProvider, UnionTypeAnalyzer $unionTypeAnalyzer, NodeNameResolver $nodeNameResolver)
{
$this->phpVersionProvider = $phpVersionProvider;
$this->unionTypeAnalyzer = $unionTypeAnalyzer;
$this->nodeNameResolver = $nodeNameResolver;
$this->typeFactory = $typeFactory;
}
public function autowire(PHPStanStaticTypeMapper $phpStanStaticTypeMapper) : void
{
@ -246,7 +239,7 @@ final class UnionTypeMapper implements TypeMapperInterface
return $phpParserUnionType;
}
if ($phpParserUnionType instanceof PhpParserUnionType) {
return $this->resolveUnionTypeNode($unionType, $phpParserUnionType, $typeKind);
return $this->resolveUnionTypeNode($phpParserUnionType);
}
return $phpParserUnionType;
}
@ -358,11 +351,7 @@ final class UnionTypeMapper implements TypeMapperInterface
}
return $typeWithClassName;
}
/**
* @param TypeKind::* $typeKind
* @return PhpParserUnionType|null|\PhpParser\Node\Identifier|\PhpParser\Node\Name|\PhpParser\Node\ComplexType
*/
private function resolveUnionTypeNode(UnionType $unionType, PhpParserUnionType $phpParserUnionType, string $typeKind)
private function resolveUnionTypeNode(PhpParserUnionType $phpParserUnionType) : ?PhpParserUnionType
{
if (!$this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) {
return null;
@ -370,10 +359,6 @@ final class UnionTypeMapper implements TypeMapperInterface
if ($this->hasObjectAndStaticType($phpParserUnionType)) {
return null;
}
$unionType = $this->typeFactory->createMixedPassedOrUnionType($unionType->getTypes());
if (!$unionType instanceof UnionType) {
return $this->phpStanStaticTypeMapper->mapToPhpParserNode($unionType, $typeKind);
}
return $phpParserUnionType;
}
}