From 361ba65af04117969d60101cafd38ea670b0171e Mon Sep 17 00:00:00 2001
From: Evan Shaw <evan.shaw@lightspeedhq.com>
Date: Fri, 12 Jan 2024 21:50:20 +1300
Subject: [PATCH 1/2] Use flags key instead of type for ClassMethod

---
 src/Psalm/Internal/Analyzer/ClassAnalyzer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
index 4e6ef467bcb..75cf98e3f89 100644
--- a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
@@ -1228,7 +1228,7 @@ static function (FunctionLikeParameter $param): PhpParser\Node\Arg {
                 $fake_stmt = new VirtualClassMethod(
                     new VirtualIdentifier('__construct'),
                     [
-                        'type' => PhpParser\Node\Stmt\Class_::MODIFIER_PUBLIC,
+                        'flags' => PhpParser\Node\Stmt\Class_::MODIFIER_PUBLIC,
                         'params' => $fake_constructor_params,
                         'stmts' => $fake_constructor_stmts,
                     ],

From f1a206fbf523ad1cd50c1cc73961a26175596a9d Mon Sep 17 00:00:00 2001
From: Evan Shaw <evan.shaw@lightspeedhq.com>
Date: Wed, 10 Jan 2024 08:41:01 +1300
Subject: [PATCH 2/2] Remove usages of deprecated getLine

---
 src/Psalm/CodeLocation.php                         | 2 +-
 src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Psalm/CodeLocation.php b/src/Psalm/CodeLocation.php
index 344a5981972..1d80ef71912 100644
--- a/src/Psalm/CodeLocation.php
+++ b/src/Psalm/CodeLocation.php
@@ -157,7 +157,7 @@ public function __construct(
         $this->preview_start = $this->docblock_start ?: $this->file_start;
 
         /** @psalm-suppress ImpureMethodCall Actually mutation-free just not marked */
-        $this->raw_line_number = $stmt->getLine();
+        $this->raw_line_number = $stmt->getStartLine();
 
         $this->docblock_line_number = $comment_line;
     }
diff --git a/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php b/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
index c8a05ea6d65..188e073153e 100644
--- a/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
+++ b/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
@@ -546,7 +546,7 @@ public function leaveNode(PhpParser\Node $node)
                 }
 
                 throw new UnexpectedValueException(
-                    'There should be function storages for line ' . $this->file_path . ':' . $node->getLine(),
+                    'There should be function storages for line ' . $this->file_path . ':' . $node->getStartLine(),
                 );
             }