Merge pull request #8542 from gphargreaves/class-constant-named-class

Add check for class const with reserved word 'class'
vimeo · Oct 7, 2022 · 52e96be · 52e96be
2 parents b6ddcdf + 41a6afd
commit 52e96be
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
@@ -508,6 +508,16 @@ public function analyze(
                 $member_stmts[] = $stmt;
 
                 foreach ($stmt->consts as $const) {
+                    if ($const->name->toLowerString() === 'class') {
+                        IssueBuffer::maybeAdd(
+                            new ReservedWord(
+                                'A class constant cannot be named \'class\'',
+                                new CodeLocation($this, $this->class),
+                                $this->fq_class_name
+                            )
+                        );
+                    }
+
                     $const_id = strtolower($this->fq_class_name) . '::' . $const->name;
 
                     foreach ($codebase->class_constants_to_rename as $original_const_id => $new_const_name) {

diff --git a/tests/ClassTest.php b/tests/ClassTest.php
@@ -925,6 +925,18 @@ final class C implements I {}
                 ',
                 'error_message' => 'InvalidTraversableImplementation',
             ],
+            'cannotNameClassConstantClass' => [
+                '<?php
+                class Foo
+                {
+                    /** @var class-string<Bar> */
+                    protected const CLASS = Bar::class;
+                }
+                
+                class Bar {}
+                ',
+                'error_message' => 'ReservedWord',
+            ]
         ];
     }
 }