Merge pull request #11390 from Tofandel/patch-3

danog · web-flow · commit 9ff40e0507fc · 2025-05-02T11:54:31.000+02:00
fix: alter of ClassMustBeFinal inserts final before attributes
diff --git a/src/Psalm/Internal/Codebase/ClassLikes.php b/src/Psalm/Internal/Codebase/ClassLikes.php
@@ -884,9 +884,15 @@ public function consolidateAnalyzedData(Methods $methods, ?Progress $progress, b
                         && $classlike_storage->stmt_location !== null
                         && isset($project_analyzer->getIssuesToFix()['ClassMustBeFinal'])
                     ) {
-                        $idx = $classlike_storage->stmt_location->getSelectionBounds()[0];
+                        $selection = $classlike_storage->stmt_location->getSnippet();
+                        $insert_pos = strpos($selection, "class");
+        
+                        if ($insert_pos === false) {
+                            $insert_pos = $classlike_storage->stmt_location->getSelectionBounds()[0];
+                        }
+
                         FileManipulationBuffer::add($classlike_storage->stmt_location->file_path, [
-                            new FileManipulation($idx, $idx, 'final ', true),
+                            new FileManipulation($insert_pos, $insert_pos, 'final ', true),
                         ]);
                     }
                 }
