Skip to content

TypeCombinator: Prevent unnecessary work #4773

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
Jan 17, 2026
Merged

TypeCombinator: Prevent unnecessary work #4773

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82a22ce
TypeCombinator: Prevent unnecessary work
staabm Jan 17, 2026
25f70b2
Update TypeCombinator.php
staabm Jan 17, 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
81 changes: 39 additions & 42 deletions src/Type/TypeCombinator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
use function array_values;
use function count;
use function get_class;
use function in_array;
use function is_int;
use function sprintf;
use function usort;
Expand Down Expand Up @@ -494,54 +495,50 @@
if (
$a instanceof ConstantStringType
) {
$description = $b->describe(VerbosityLevel::value());
Copy link
Copy Markdown
Contributor Author

@staabm staabm Jan 17, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

describe $b only when $a == ''.

before we described $b no matter which constant-value $a had

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, new IntersectionType([
new StringType(),
new AccessoryNonEmptyStringType(),
...self::getAccessoryCaseStringTypes($b),
])];
if ($a->getValue() === '') {
$description = $b->describe(VerbosityLevel::value());
if (in_array($description, ['non-empty-string', 'non-falsy-string'], true)) {
return [null, self::intersect(
new StringType(),
...self::getAccessoryCaseStringTypes($b),
)];
}
}

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

if (
$b instanceof ConstantStringType
) {
$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 [new IntersectionType([
new StringType(),
new AccessoryNonEmptyStringType(),
...self::getAccessoryCaseStringTypes($a),
]), null];
if ($b->getValue() === '') {
$description = $a->describe(VerbosityLevel::value());
if (in_array($description, ['non-empty-string', 'non-falsy-string'], true)) {
return [self::intersect(
new StringType(),
...self::getAccessoryCaseStringTypes($a),
), null];
}
}

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

Expand Down Expand Up @@ -1101,7 +1098,7 @@
unset($arraysToProcess[$i]);
continue 2;
}
}

Check failure on line 1101 in src/Type/TypeCombinator.php

View workflow job for this annotation

GitHub Actions / PHPStan (7.4, windows-latest, 0) 

Parameter #1 $array (non-empty-list<PHPStan\Type\Type>) of array_values is already a list, call has no effect.
}

return array_merge($newArrays, $arraysToProcess);
Expand Down
Loading