From 94003a3885c682a340b629fec69c9f07519aa11c Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Fri, 9 Dec 2022 21:50:10 -0400
Subject: [PATCH 1/2] Fixed dynamic property on LanguageServer

Fixes vimeo/psalm#8873
---
 src/Psalm/Internal/LanguageServer/LanguageServer.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Psalm/Internal/LanguageServer/LanguageServer.php b/src/Psalm/Internal/LanguageServer/LanguageServer.php
index 2b1dfafc7f6..74ebbeffab4 100644
--- a/src/Psalm/Internal/LanguageServer/LanguageServer.php
+++ b/src/Psalm/Internal/LanguageServer/LanguageServer.php
@@ -15,6 +15,7 @@
 use Amp\Success;
 use Generator;
 use InvalidArgumentException;
+use JsonMapper;
 use LanguageServerProtocol\ClientCapabilities;
 use LanguageServerProtocol\CompletionOptions;
 use LanguageServerProtocol\Diagnostic;
@@ -108,6 +109,12 @@ class LanguageServer extends Dispatcher
      */
     protected $current_issues = [];
 
+    /**
+     * This should actually be a private property on `parent`
+     * @var JsonMapper
+     */
+    protected $mapper;
+
     public function __construct(
         ProtocolReader $reader,
         ProtocolWriter $writer,

From d19759cc23377eddca09164646bec2c006d4f64c Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Fri, 9 Dec 2022 21:57:03 -0400
Subject: [PATCH 2/2] Suppress irrelevant Psalm issue

We're not defining this property to use it, we're defining it to
suppress PHP deprecation warning
---
 src/Psalm/Internal/LanguageServer/LanguageServer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Psalm/Internal/LanguageServer/LanguageServer.php b/src/Psalm/Internal/LanguageServer/LanguageServer.php
index 74ebbeffab4..c032d501cb7 100644
--- a/src/Psalm/Internal/LanguageServer/LanguageServer.php
+++ b/src/Psalm/Internal/LanguageServer/LanguageServer.php
@@ -111,6 +111,7 @@ class LanguageServer extends Dispatcher
 
     /**
      * This should actually be a private property on `parent`
+     * @psalm-suppress UnusedProperty
      * @var JsonMapper
      */
     protected $mapper;