MissingClassConstType

jack-worman · Mar 14, 2024 · 97490d3 · 97490d3
1 parent ab9570f
commit 97490d3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/docs/running_psalm/issues/MissingClassConstType.md b/docs/running_psalm/issues/MissingClassConstType.md
@@ -6,7 +6,7 @@ Emitted when a class constant doesn't have a declared type.
 <?php
 
 class A {
-    private const B = 0;
+    public const B = 0;
 }
 ```
 
@@ -16,6 +16,6 @@ Correct with:
 <?php
 
 class A {
-    private const int B = 0;
+    public const int B = 0;
 }
 ```
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php
@@ -1421,15 +1421,18 @@ private function visitClassConstDeclaration(
             );
 
 
-            if ($this->codebase->analysis_php_version_id >= 8_03_00) {
+            if (
+                $this->codebase->analysis_php_version_id >= 8_03_00
+                && $stmt->type === null
+            ) {
                 IssueBuffer::maybeAdd(
                     new MissingClassConstType(
                         sprintf(
                             'Class constant "%s::%s" should have a declared type.',
                             $storage->name,
                             $const->name->name,
                         ),
-                        new CodeLocation($this->file_scanner, $stmt),
+                        new CodeLocation($this->file_scanner, $const),
                     ),
                     $suppressed_issues,
                 );

diff --git a/tests/DocumentationTest.php b/tests/DocumentationTest.php
@@ -316,6 +316,7 @@ public function providerInvalidCodeParse(): array
 
                 case 'InvalidOverride':
                 case 'MissingOverrideAttribute':
+                case 'MissingClassConstType':
                     $php_version = '8.3';
                     break;
             }

diff --git a/tests/MissingClassConstTypeTest.php b/tests/MissingClassConstTypeTest.php
@@ -4,6 +4,7 @@
 
 namespace Psalm\Tests;
 
+use Psalm\Issue\MissingClassConstType;
 use Psalm\Tests\Traits\InvalidCodeAnalysisTestTrait;
 use Psalm\Tests\Traits\ValidCodeAnalysisTestTrait;
 
@@ -33,6 +34,8 @@ class A {
                         public const B = 0;
                     }
                     PHP,
+                'assertions' => [],
+                'ignored_issues' => [],
                 'php_version' => '8.2',
             ],
         ];
@@ -48,7 +51,7 @@ class A {
                         public const B = 0;
                     }
                     PHP,
-                'error_message' => 'MissingClassConstType',
+                'error_message' => MissingClassConstType::getIssueType(),
                 'error_levels' => [],
                 'php_version' => '8.3',
             ],