Skip to content

Introduce UnionType::filterTypes #3607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Introduce UnionType::filterTypes #3607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b10da3
Introduce filterTypes
VincentLanglet Nov 5, 2024
6b65db3
Improve
VincentLanglet Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 9 additions & 58 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5594,18 +5594,7 @@ private function exactInstantiation(New_ $node, string $className): ?Type
private function filterTypeWithMethod(Type $typeWithMethod, string $methodName): ?Type
{
if ($typeWithMethod instanceof UnionType) {
$newTypes = [];
foreach ($typeWithMethod->getTypes() as $innerType) {
if (!$innerType->hasMethod($methodName)->yes()) {
continue;
}

$newTypes[] = $innerType;
}
if (count($newTypes) === 0) {
return null;
}
$typeWithMethod = TypeCombinator::union(...$newTypes);
$typeWithMethod = $typeWithMethod->filterTypes(static fn (Type $innerType) => $innerType->hasMethod($methodName)->yes());
}

if (!$typeWithMethod->hasMethod($methodName)->yes()) {
Expand Down Expand Up @@ -5709,18 +5698,7 @@ private function methodCallReturnType(Type $typeWithMethod, string $methodName,
public function getPropertyReflection(Type $typeWithProperty, string $propertyName): ?ExtendedPropertyReflection
{
if ($typeWithProperty instanceof UnionType) {
$newTypes = [];
foreach ($typeWithProperty->getTypes() as $innerType) {
if (!$innerType->hasProperty($propertyName)->yes()) {
continue;
}

$newTypes[] = $innerType;
}
if (count($newTypes) === 0) {
return null;
}
$typeWithProperty = TypeCombinator::union(...$newTypes);
$typeWithProperty = $typeWithProperty->filterTypes(static fn (Type $innerType) => $innerType->hasProperty($propertyName)->yes());
}
if (!$typeWithProperty->hasProperty($propertyName)->yes()) {
return null;
Expand Down Expand Up @@ -5749,18 +5727,7 @@ private function propertyFetchType(Type $fetchedOnType, string $propertyName, Ex
public function getConstantReflection(Type $typeWithConstant, string $constantName): ?ConstantReflection
{
if ($typeWithConstant instanceof UnionType) {
$newTypes = [];
foreach ($typeWithConstant->getTypes() as $innerType) {
if (!$innerType->hasConstant($constantName)->yes()) {
continue;
}

$newTypes[] = $innerType;
}
if (count($newTypes) === 0) {
return null;
}
$typeWithConstant = TypeCombinator::union(...$newTypes);
$typeWithConstant = $typeWithConstant->filterTypes(static fn (Type $innerType) => $innerType->hasConstant($constantName)->yes());
}
if (!$typeWithConstant->hasConstant($constantName)->yes()) {
return null;
Expand Down Expand Up @@ -5804,18 +5771,10 @@ private function getNativeConstantTypes(): array
public function getIterableKeyType(Type $iteratee): Type
{
if ($iteratee instanceof UnionType) {
$newTypes = [];
foreach ($iteratee->getTypes() as $innerType) {
if (!$innerType->isIterable()->yes()) {
continue;
}

$newTypes[] = $innerType;
}
if (count($newTypes) === 0) {
return $iteratee->getIterableKeyType();
$filtered = $iteratee->filterTypes(static fn (Type $innerType) => $innerType->isIterable()->yes());
if (!$filtered instanceof NeverType) {
$iteratee = $filtered;
}
$iteratee = TypeCombinator::union(...$newTypes);
}

return $iteratee->getIterableKeyType();
Expand All @@ -5824,18 +5783,10 @@ public function getIterableKeyType(Type $iteratee): Type
public function getIterableValueType(Type $iteratee): Type
{
if ($iteratee instanceof UnionType) {
$newTypes = [];
foreach ($iteratee->getTypes() as $innerType) {
if (!$innerType->isIterable()->yes()) {
continue;
}

$newTypes[] = $innerType;
}
if (count($newTypes) === 0) {
return $iteratee->getIterableValueType();
$filtered = $iteratee->filterTypes(static fn (Type $innerType) => $innerType->isIterable()->yes());
if (!$filtered instanceof NeverType) {
$iteratee = $filtered;
}
$iteratee = TypeCombinator::union(...$newTypes);
}

return $iteratee->getIterableValueType();
Expand Down
17 changes: 17 additions & 0 deletions src/Type/UnionType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,23 @@ public function getTypes(): array
return $this->types;
}

/**
* @param callable(Type $type): bool $filterCb
*/
public function filterTypes(callable $filterCb): Type
{
$newTypes = [];
foreach ($this->getTypes() as $innerType) {
if (!$filterCb($innerType)) {
continue;
}

$newTypes[] = $innerType;
}

return TypeCombinator::union(...$newTypes);
}

public function isNormalized(): bool
{
return $this->normalized;
Expand Down
Loading