Skip to content

TypeCombinator: Remove always true condition #5383

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
staabm merged 2 commits into from
Apr 2, 2026
Merged

TypeCombinator: Remove always true condition #5383

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
be25bbf
TypeCombinator: Remove always true condition
staabm Apr 2, 2026
7beb39a
Update phpstan-baseline.neon
staabm Apr 2, 2026
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
14 changes: 1 addition & 13 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,7 @@ parameters:
-
rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantStringType is error-prone and deprecated. Use Type::getConstantStrings() instead.'
identifier: phpstanApi.instanceofType
count: 3
count: 2
path: src/Type/TypeCombinator.php

-
Expand Down Expand Up @@ -1743,18 +1743,6 @@ parameters:
count: 2
path: src/Type/TypeCombinator.php

-
rawMessage: Instanceof between PHPStan\Type\Constant\ConstantIntegerType and PHPStan\Type\Constant\ConstantIntegerType will always evaluate to true.
identifier: instanceof.alwaysTrue
count: 1
path: src/Type/TypeCombinator.php

-
rawMessage: Result of || is always true.
identifier: booleanOr.alwaysTrue
count: 1
path: src/Type/TypeCombinator.php

-
rawMessage: Doing instanceof PHPStan\Type\IntersectionType is error-prone and deprecated.
identifier: phpstanApi.instanceofType
Expand Down
5 changes: 1 addition & 4 deletions src/Type/TypeCombinator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,10 +793,7 @@ private static function processArrayAccessoryTypes(array $arrayTypes): array
continue;
}
if ($innerType instanceof HasOffsetType) {
$offset = $innerType->getOffsetType();
if ($offset instanceof ConstantStringType || $offset instanceof ConstantIntegerType) {
$innerType = new HasOffsetValueType($offset, $arrayType->getIterableValueType());
}
$innerType = new HasOffsetValueType($innerType->getOffsetType(), $arrayType->getIterableValueType());
Copy link
Copy Markdown
Contributor Author

@staabm staabm Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HasOffsetType->getOffsetType() is typed to return ConstantStringType|ConstantIntegerType

}
if ($innerType instanceof HasOffsetValueType) {
$accessoryTypes[sprintf('hasOffsetValue(%s)', $innerType->getOffsetType()->describe(VerbosityLevel::cache()))][$i] = $innerType;
Expand Down
Loading