Merge pull request #7463 from orklah/Properties

fix code where the offset was wrong
vimeo · Jan 22, 2022 · e0d3c3f · e0d3c3f
2 parents c3ad520 + b965545
commit e0d3c3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Codebase/Properties.php b/src/Psalm/Internal/Codebase/Properties.php
@@ -327,12 +327,12 @@ public function getPropertyType(
 
         if ($storage->type) {
             if ($property_set) {
-                if (isset($class_storage->pseudo_property_set_types[$property_name])) {
-                    return $class_storage->pseudo_property_set_types[$property_name];
+                if (isset($class_storage->pseudo_property_set_types['$'.$property_name])) {
+                    return $class_storage->pseudo_property_set_types['$'.$property_name];
                 }
             } else {
-                if (isset($class_storage->pseudo_property_get_types[$property_name])) {
-                    return $class_storage->pseudo_property_get_types[$property_name];
+                if (isset($class_storage->pseudo_property_get_types['$'.$property_name])) {
+                    return $class_storage->pseudo_property_get_types['$'.$property_name];
                 }
             }
 

diff --git a/src/Psalm/Internal/Codebase/Reflection.php b/src/Psalm/Internal/Codebase/Reflection.php
@@ -3,6 +3,7 @@
 namespace Psalm\Internal\Codebase;
 
 use Exception;
+use LibXMLError;
 use LogicException;
 use Psalm\Codebase;
 use Psalm\Internal\Analyzer\ClassLikeAnalyzer;
@@ -64,7 +65,7 @@ public function registerClass(ReflectionClass $reflected_class): void
     {
         $class_name = $reflected_class->name;
 
-        if ($class_name === 'LibXMLError') {
+        if ($class_name === LibXMLError::class) {
             $class_name = 'libXMLError';
         }