From b9655457da7df3960fbf9b8aecc9d3990c263d38 Mon Sep 17 00:00:00 2001 From: orklah Date: Sat, 22 Jan 2022 21:09:37 +0100 Subject: [PATCH] fix code where the offset was wrong --- src/Psalm/Internal/Codebase/Properties.php | 8 ++++---- src/Psalm/Internal/Codebase/Reflection.php | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Psalm/Internal/Codebase/Properties.php b/src/Psalm/Internal/Codebase/Properties.php index 2a0137a5db6..5e9dcefe6f3 100644 --- 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 index 18bff0bdd0c..424c2a1cdeb 100644 --- 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'; }