Skip to content

Fix false positives on a nullable enum property under null coalesce #11878

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

Open
eyupcanakman wants to merge 1 commit into
base: 6.x
Choose a base branch
from
+68 −11
Open

Fix false positives on a nullable enum property under null coalesce #11878

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/AtomicPropertyFetchAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,16 @@ public static function analyze(
if ($class_storage->is_enum || in_array('UnitEnum', $codebase->getParentInterfaces($fq_class_name))) {
if ($prop_name === 'value' && !$class_storage->is_enum) {
$has_valid_fetch_type = true;
$stmt_type = $statements_analyzer->node_data->getType($stmt);
$statements_analyzer->node_data->setType(
$stmt,
new Union([
new TString(),
new TInt(),
]),
Type::combineUnionTypes(
new Union([
new TString(),
new TInt(),
]),
$stmt_type,
),
);
} elseif ($prop_name === 'value' && $class_storage->enum_type !== null && $class_storage->enum_cases) {
$has_valid_fetch_type = true;
Expand Down Expand Up @@ -1024,14 +1028,18 @@ private static function handleEnumName(
$relevant_enum_case_names = array_keys($class_storage->enum_cases);
}

$stmt_type = $statements_analyzer->node_data->getType($stmt);
$statements_analyzer->node_data->setType(
$stmt,
empty($relevant_enum_case_names)
? Type::getNonEmptyString()
: new Union(array_map(
static fn(string $name): TString => Type::getAtomicStringFromLiteral($name),
$relevant_enum_case_names,
)),
Type::combineUnionTypes(
empty($relevant_enum_case_names)
? Type::getNonEmptyString()
: new Union(array_map(
static fn(string $name): TString => Type::getAtomicStringFromLiteral($name),
$relevant_enum_case_names,
)),
$stmt_type,
),
);
}

Expand Down Expand Up @@ -1067,10 +1075,14 @@ private static function handleEnumValue(
$case_values[] = $case_value ?? new TMixed();
}

$stmt_type = $statements_analyzer->node_data->getType($stmt);
/** @psalm-suppress ArgumentTypeCoercion */
$statements_analyzer->node_data->setType(
$stmt,
new Union($case_values),
Type::combineUnionTypes(
new Union($case_values),
$stmt_type,
),
);
}

Expand Down
45 changes: 45 additions & 0 deletions tests/EnumTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,51 @@ enum Foo: string {
'ignored_issues' => [],
'php_version' => '8.1',
],
'nullCoalesceOnNullableBackedEnumValue #11171' => [
'code' => <<<'PHP'
<?php
enum Suit: string {
case Hearts = "H";
case Spades = "S";
}
function plain(?Suit $suit): string {
return $suit->value ?? "none";
}
function nullsafe(?Suit $suit): string {
return $suit?->value ?? "none";
}
PHP,
'assertions' => [],
'ignored_issues' => [],
'php_version' => '8.1',
],
'nullCoalesceOnNullableEnumName #11171' => [
'code' => <<<'PHP'
<?php
enum Direction {
case North;
case South;
}
function name(?Direction $dir): string {
return $dir->name ?? "unknown";
}
PHP,
'assertions' => [],
'ignored_issues' => [],
'php_version' => '8.1',
],
'nullCoalesceOnNullableBackedEnumInterfaceValue #11171' => [
'code' => <<<'PHP'
<?php
interface HasBackingValue extends \BackedEnum {}
function value(?HasBackingValue $enum): string|int {
return $enum->value ?? "none";
}
PHP,
'assertions' => [],
'ignored_issues' => [],
'php_version' => '8.1',
],
];
}

Expand Down
Loading