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

Drop special handling of constant references on enums #6995

Merged
merged 2 commits into from Nov 27, 2021
Merged

Drop special handling of constant references on enums #6995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f215ed2
Drop special handling of constant references on enums
weirdan Nov 26, 2021
97445b5
Correctly process constant references on enum-valued variables
weirdan Nov 27, 2021
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
78 changes: 34 additions & 44 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ClassConstFetchAnalyzer.php
View file
Open in desktop
Expand Up @@ -210,53 +210,43 @@ public static function analyze(

$const_class_storage = $codebase->classlike_storage_provider->get($fq_class_name);

if ($const_class_storage->is_enum) {
if (isset($const_class_storage->enum_cases[$stmt->name->name])) {
$class_constant_type = new Type\Union([
new Type\Atomic\TEnumCase($fq_class_name, $stmt->name->name)
]);
} else {
$class_constant_type = null;
}
if ($fq_class_name === $context->self
|| (
$statements_analyzer->getSource()->getSource() instanceof TraitAnalyzer &&
$fq_class_name === $statements_analyzer->getSource()->getFQCLN()
)
) {
$class_visibility = \ReflectionProperty::IS_PRIVATE;
} elseif ($context->self &&
($codebase->classlikes->classExtends($context->self, $fq_class_name)
|| $codebase->classlikes->classExtends($fq_class_name, $context->self))
) {
$class_visibility = \ReflectionProperty::IS_PROTECTED;
} else {
if ($fq_class_name === $context->self
|| (
$statements_analyzer->getSource()->getSource() instanceof TraitAnalyzer &&
$fq_class_name === $statements_analyzer->getSource()->getFQCLN()
)
) {
$class_visibility = \ReflectionProperty::IS_PRIVATE;
} elseif ($context->self &&
($codebase->classlikes->classExtends($context->self, $fq_class_name)
|| $codebase->classlikes->classExtends($fq_class_name, $context->self))
) {
$class_visibility = \ReflectionProperty::IS_PROTECTED;
} else {
$class_visibility = \ReflectionProperty::IS_PUBLIC;
}

try {
$class_constant_type = $codebase->classlikes->getClassConstantType(
$fq_class_name,
$stmt->name->name,
$class_visibility,
$statements_analyzer
);
} catch (\InvalidArgumentException $_) {
return true;
} catch (\Psalm\Exception\CircularReferenceException $e) {
if (IssueBuffer::accepts(
new CircularReference(
'Constant ' . $const_id . ' contains a circular reference',
new CodeLocation($statements_analyzer->getSource(), $stmt)
),
$statements_analyzer->getSuppressedIssues()
)) {
// fall through
}
$class_visibility = \ReflectionProperty::IS_PUBLIC;
}

return true;
try {
$class_constant_type = $codebase->classlikes->getClassConstantType(
$fq_class_name,
$stmt->name->name,
$class_visibility,
$statements_analyzer
);
} catch (\InvalidArgumentException $_) {
return true;
} catch (\Psalm\Exception\CircularReferenceException $e) {
if (IssueBuffer::accepts(
new CircularReference(
'Constant ' . $const_id . ' contains a circular reference',
new CodeLocation($statements_analyzer->getSource(), $stmt)
),
$statements_analyzer->getSuppressedIssues()
)) {
// fall through
}

return true;
}

if (!$class_constant_type) {
Expand Down
20 changes: 20 additions & 0 deletions tests/EnumTest.php
View file
Open in desktop
Expand Up @@ -174,6 +174,26 @@ public static function foo(self $i) : void {}
[],
'8.1',
],
'wildcardConstantsOnEnum' => [
'<?php
enum A {
const C_1 = 1;
const C_2 = 2;
const C_3 = 3;

/**
* @param self::C_* $i
*/
public static function foo(int $i) : void {}
}

A::foo(A::C_1);
A::foo(A::C_2);
A::foo(A::C_3);',
'assertions' => [],
[],
'8.1',
],
'EnumCaseInAttribute' => [
'<?php
class CreateController {
Expand Down