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

Updated Rector to commit 6f330105bef70bec222f1cc6f86c09b137dff44f

Browse Source 
6f330105be [PHPStanStaticTypeMapper] Clean up tweak false and bool check on UnionTypeMapper (#5209)
This commit is contained in:
Tomas Votruba 2023-10-28 12:43:37 +00:00
parent a3cb68c58c
commit b60b85beb4
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
View File

@ -126,12 +126,12 @@ final class UnionTypeMapper implements TypeMapperInterface
Assert::isAnyOf($firstType, [Name::class, Identifier::class]);
Assert::isAnyOf($secondType, [Name::class, Identifier::class]);
} catch (InvalidArgumentException $exception) {
return $this->resolveUnionTypes($phpParserUnionType, $totalTypes);
return $this->resolveUnionTypes($phpParserUnionType);
}
$firstTypeValue = $firstType->toString();
$secondTypeValue = $secondType->toString();
if ($firstTypeValue === $secondTypeValue) {
return $this->resolveUnionTypes($phpParserUnionType, $totalTypes);
return $this->resolveUnionTypes($phpParserUnionType);
}
if ($firstTypeValue === 'null') {
return $this->resolveNullableType(new NullableType($secondType));
@ -140,7 +140,7 @@ final class UnionTypeMapper implements TypeMapperInterface
return $this->resolveNullableType(new NullableType($firstType));
}
}
return $this->resolveUnionTypes($phpParserUnionType, $totalTypes);
return $this->resolveUnionTypes($phpParserUnionType);
}
/**
* @return null|\PhpParser\Node\NullableType|PhpParserUnionType
@ -195,30 +195,11 @@ final class UnionTypeMapper implements TypeMapperInterface
}
return $unionTypeAnalysis->hasArray();
}
private function resolveUnionTypes(PhpParserUnionType $phpParserUnionType, int $totalTypes) : ?PhpParserUnionType
private function resolveUnionTypes(PhpParserUnionType $phpParserUnionType) : ?PhpParserUnionType
{
if (!$this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) {
return null;
}
if ($totalTypes === 2) {
return $phpParserUnionType;
}
$identifierNames = [];
foreach ($phpParserUnionType->types as $type) {
if ($type instanceof Identifier) {
$identifierNames[] = $type->toString();
}
}
if (!\in_array('bool', $identifierNames, \true)) {
return $phpParserUnionType;
}
if (!\in_array('false', $identifierNames, \true)) {
return $phpParserUnionType;
}
$phpParserUnionType->types = \array_filter($phpParserUnionType->types, static function (Node $node) : bool {
return !$node instanceof Identifier || $node->toString() !== 'false';
});
$phpParserUnionType->types = \array_values($phpParserUnionType->types);
return $phpParserUnionType;
}
private function matchTypeForNullableUnionType(UnionType $unionType) : ?Type

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '5f86e6bb082d06c1fc7f3ca53a9e42389319c3eb';
public const PACKAGE_VERSION = '6f330105bef70bec222f1cc6f86c09b137dff44f';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-10-28 13:41:09';
public const RELEASE_DATE = '2023-10-28 19:40:43';
/**
* @var int
*/