Skip to content
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

Jump to bottom

Fix non-empty-literal-string to behave as subtype of non-empty-string (fixes #7095). #7105

Merged
merged 1 commit into from Dec 8, 2021
Merged

Fix non-empty-literal-string to behave as subtype of non-empty-string (fixes #7095). #7105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/Psalm/Internal/Type/TypeCombiner.php
View file
Open in desktop
Expand Up @@ -38,6 +38,7 @@
use Psalm\Type\Atomic\TNonEmptyList;
use Psalm\Type\Atomic\TNonEmptyLowercaseString;
use Psalm\Type\Atomic\TNonEmptyMixed;
use Psalm\Type\Atomic\TNonEmptyNonspecificLiteralString;
use Psalm\Type\Atomic\TNonEmptyString;
use Psalm\Type\Atomic\TNonFalsyString;
use Psalm\Type\Atomic\TNonspecificLiteralInt;
Expand Down Expand Up @@ -1131,6 +1132,15 @@ private static function scrapeStringProperties(
&& get_class($type) === TNonEmptyLowercaseString::class
) {
//no-change
} elseif (get_class($combination->value_types['string'])
=== TNonEmptyNonspecificLiteralString::class
&& $type instanceof TNonEmptyString
) {
$combination->value_types['string'] = new TNonEmptyString();
} elseif (get_class($type) === TNonEmptyNonspecificLiteralString::class
&& $combination->value_types['string'] instanceof TNonEmptyString
) {
// do nothing
} else {
$combination->value_types['string'] = new TString();
}
Expand Down
14 changes: 14 additions & 0 deletions tests/TypeCombinationTest.php
View file
Open in desktop
Expand Up @@ -801,6 +801,20 @@ public function providerTestValidTypeCombination(): array
'positive-int',
]
],
'combineNonEmptyStringAndNonEmptyNonSpecificLiteralString' => [
'non-empty-string',
[
'non-empty-literal-string',
'non-empty-string',
],
],
'combineNonEmptyNonSpecificLiteralStringAndNonEmptyString' => [
'non-empty-string',
[
'non-empty-string',
'non-empty-literal-string',
],
],
];
}

Expand Down