mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-21 07:52:01 +02:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit 09c077e25801da58834be284a792c3987ea806ef

Browse Source 
09c077e258 [TypeDeclaration] Add false and true in union support on ReturnUnionTypeRector (#5355)
This commit is contained in:
Tomas Votruba 2024-01-03 07:52:06 +00:00
parent 1daa932d00
commit 5c10ef9158
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules/TypeDeclaration/TypeInferer/ReturnTypeInferer/ReturnedNodesReturnTypeInfererTypeInferer.php
View File

@ -84,7 +84,7 @@ final class ReturnedNodesReturnTypeInfererTypeInferer
if ($this->silentVoidResolver->hasSilentVoid($functionLike)) {
$types[] = new VoidType();
}
return $this->typeFactory->createMixedPassedOrUnionType($types);
return $this->typeFactory->createMixedPassedOrUnionTypeAndKeepConstant($types);
}
/**
* @return Return_[]

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '5c0397910fbd9735c375c4632ec116ebe8609f25';
public const PACKAGE_VERSION = '09c077e25801da58834be284a792c3987ea806ef';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-01-02 21:36:20';
public const RELEASE_DATE = '2024-01-03 14:49:58';
/**
* @var int
*/

31
src/NodeTypeResolver/PHPStan/Type/TypeFactory.php
View File

@ -59,11 +59,11 @@ final class TypeFactory
$constantTypeHashes = [];
$uniqueTypes = [];
$totalTypes = \count($types);
$hasFalse = \false;
$hasTrue = \false;
foreach ($types as $type) {
if ($totalTypes > 1 && $type instanceof ObjectWithoutClassTypeWithParentTypes) {
$parents = $type->getParentTypes();
$type = new ObjectType($parents[0]->getClassName());
}
$type = $this->normalizeObjectType($totalTypes, $type);
$type = $this->normalizeBooleanType($hasFalse, $hasTrue, $type);
$removedConstantType = $this->removeValueFromConstantType($type);
$removedConstantTypeHash = $this->typeHasher->createTypeHash($removedConstantType);
if ($keepConstant && $type !== $removedConstantType) {
@ -83,6 +83,29 @@ final class TypeFactory
// re-index
return \array_values($uniqueTypes);
}
private function normalizeObjectType(int $totalTypes, Type $type) : Type
{
if ($totalTypes > 1 && $type instanceof ObjectWithoutClassTypeWithParentTypes) {
$parents = $type->getParentTypes();
return new ObjectType($parents[0]->getClassName());
}
return $type;
}
private function normalizeBooleanType(bool &$hasFalse, bool &$hasTrue, Type $type) : Type
{
if ($type instanceof ConstantBooleanType) {
if ($type->getValue()) {
$hasTrue = \true;
}
if ($type->getValue() === \false) {
$hasFalse = \true;
}
}
if ($hasFalse && $hasTrue && $type instanceof ConstantBooleanType) {
return new BooleanType();
}
return $type;
}
/**
* @param Type[] $types
* @return Type[]

2
src/NodeTypeResolver/PHPStan/TypeHasher.php
View File

@ -39,7 +39,7 @@ final class TypeHasher
return $this->resolveUniqueTypeWithClassNameHash($type);
}
if ($type instanceof ConstantType) {
return \get_class($type) . $type->getValue();
return \get_class($type);
}
if ($type instanceof UnionType) {
return $this->createUnionTypeHash($type);