Skip to content

TypeCombinator: Simplify ConstantStringType handling #4666

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
ondrejmirtes merged 2 commits into from
Dec 25, 2025
Merged

TypeCombinator: Simplify ConstantStringType handling #4666

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
8a525ac
TypeCombinator: Simplify ConstantStringType handling
staabm Dec 25, 2025
5bd1904
Update phpstan-baseline.neon
staabm Dec 25, 2025
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
2 changes: 1 addition & 1 deletion 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: 5
count: 3
path: src/Type/TypeCombinator.php

-
Expand Down
82 changes: 44 additions & 38 deletions src/Type/TypeCombinator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,50 +494,56 @@ private static function compareTypesInUnion(Type $a, Type $b): ?array

if (
$a instanceof ConstantStringType
&& $a->getValue() === ''
&& ($b->describe(VerbosityLevel::value()) === 'non-empty-string'
|| $b->describe(VerbosityLevel::value()) === 'non-falsy-string')
Comment on lines -498 to -499
Copy link
Contributor Author

@staabm staabm Dec 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

new: describe each type only once

) {
return [null, self::intersect(
new StringType(),
...self::getAccessoryCaseStringTypes($b),
)];
}

if (
$b instanceof ConstantStringType
&& $b->getValue() === ''
&& ($a->describe(VerbosityLevel::value()) === 'non-empty-string'
|| $a->describe(VerbosityLevel::value()) === 'non-falsy-string')
) {
return [self::intersect(
new StringType(),
...self::getAccessoryCaseStringTypes($a),
), null];
}

if (
$a instanceof ConstantStringType
&& $a->getValue() === '0'
&& $b->describe(VerbosityLevel::value()) === 'non-falsy-string'
) {
return [null, self::intersect(
new StringType(),
new AccessoryNonEmptyStringType(),
...self::getAccessoryCaseStringTypes($b),
)];
$description = $b->describe(VerbosityLevel::value());
if (
$a->getValue() === ''
&& ($description === 'non-empty-string'
|| $description === 'non-falsy-string')
) {
return [null, self::intersect(
new StringType(),
...self::getAccessoryCaseStringTypes($b),
)];
}

if (
$a->getValue() === '0'
&& $description === 'non-falsy-string'
) {
return [null, self::intersect(
new StringType(),
new AccessoryNonEmptyStringType(),
...self::getAccessoryCaseStringTypes($b),
)];
}
}

if (
$b instanceof ConstantStringType
&& $b->getValue() === '0'
&& $a->describe(VerbosityLevel::value()) === 'non-falsy-string'
) {
return [self::intersect(
new StringType(),
new AccessoryNonEmptyStringType(),
...self::getAccessoryCaseStringTypes($a),
), null];
$description = $a->describe(VerbosityLevel::value());
if (
$b->getValue() === ''
&& ($description === 'non-empty-string'
|| $description === 'non-falsy-string')
) {
return [self::intersect(
new StringType(),
...self::getAccessoryCaseStringTypes($a),
), null];
}

if (
$b->getValue() === '0'
&& $description === 'non-falsy-string'
) {
return [self::intersect(
new StringType(),
new AccessoryNonEmptyStringType(),
...self::getAccessoryCaseStringTypes($a),
), null];
}
}

return null;
Expand Down
Loading