Merge pull request #10605 from edsrzf/php-parser-tweaks

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;
     }

src/Psalm/Internal/Analyzer/ClassAnalyzer.php

@@ -1231,7 +1231,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,
                     ],

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(),
                 );
             }