Fix improper property var calculation

Ref #1332

src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/PropertyAssignmentAnalyzer.php

@@ -1094,9 +1094,9 @@ class PropertyAssignmentAnalyzer
         Type\Union $assignment_value_type,
         Context $context
     ) {
-        $var_id = ExpressionAnalyzer::getVarId(
+        $var_id = ExpressionAnalyzer::getArrayVarId(
             $stmt,
-            $statements_analyzer->getFQCLN(),
+            $context->self,
             $statements_analyzer
         );
 

tests/TypeReconciliation/ConditionalTest.php

@@ -2566,6 +2566,26 @@ class ConditionalTest extends \Psalm\Tests\TestCase
                      */
                     if(!(count($colonnes) == 37 || count($colonnes) == 40)) {}',
             ],
+            'reconcilePropertyInTrait' => [
+                '<?php
+                    class A {}
+
+                    trait T {
+                        private static ?A $one = null;
+
+                        private static function maybeSetOne(): A {
+                            if (null === self::$one) {
+                                self::$one = new A();
+                            }
+
+                            return self::$one;
+                        }
+                    }
+
+                    class Implementer {
+                        use T;
+                    }'
+            ],
         ];
     }