Prevent ArrayAccess on object from being memoised

vimeo · Apr 12, 2020 · 547efcc · 547efcc
1 parent c733d6d
commit 547efcc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/Psalm/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php
@@ -228,6 +228,8 @@ public static function reconcileKeyedTypes(
 
             $did_type_exist = isset($existing_types[$key]);
 
+            $has_object_array_access = false;
+
             $result_type = isset($existing_types[$key])
                 ? clone $existing_types[$key]
                 : self::getValueForKey(
@@ -239,7 +241,8 @@ public static function reconcileKeyedTypes(
                     $has_isset,
                     $has_inverted_isset,
                     $has_empty,
-                    $inside_loop
+                    $inside_loop,
+                    $has_object_array_access
                 );
 
             if ($result_type && empty($result_type->getAtomicTypes())) {
@@ -316,7 +319,9 @@ public static function reconcileKeyedTypes(
                 $result_type->failed_reconciliation = true;
             }
 
-            $existing_types[$key] = $result_type;
+            if (!$has_object_array_access) {
+                $existing_types[$key] = $result_type;
+            }
         }
 
         return $existing_types;
@@ -448,7 +453,8 @@ private static function getValueForKey(
         bool $has_isset,
         bool $has_inverted_isset,
         bool $has_empty,
-        bool $inside_loop
+        bool $inside_loop,
+        bool &$has_object_array_access
     ) {
         $key_parts = self::breakUpPathIntoParts($key);
 
@@ -546,6 +552,9 @@ private static function getValueForKey(
                             return Type::getMixed($inside_loop);
                         } elseif ($existing_key_type_part instanceof TString) {
                             $new_base_type_candidate = Type::getString();
+                        } elseif ($existing_key_type_part instanceof Type\Atomic\TNamedObject) {
+                            $has_object_array_access = true;
+                            return null;
                         } elseif (!$existing_key_type_part instanceof Type\Atomic\ObjectLike) {
                             return Type::getMixed();
                         } elseif ($array_key[0] === '$' || ($array_key[0] !== '\'' && !\is_numeric($array_key[0]))) {

diff --git a/tests/ArrayAccessTest.php b/tests/ArrayAccessTest.php
@@ -776,7 +776,12 @@ public function offsetUnset($offset) : void
                     $array = new C([]);
                     $array["key"] = [];
                     /** @psalm-suppress PossiblyInvalidArrayAssignment */
-                    $array["key"][] = "testing";',
+                    $array["key"][] = "testing";
+
+                    $c = isset($array["foo"]) ? $array["foo"] : null;',
+                [
+                    '$c' => 'C|null|scalar',
+                ]
             ],
             'singleLetterOffset' => [
                 '<?php