Fixes

vimeo · Jun 23, 2022 · bca70c1 · bca70c1
1 parent c9bebee
commit bca70c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "php": "^8.1",
         "ext-SimpleXML": "*",
         "ext-ctype": "*",
         "ext-dom": "*",

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/ArrayAssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/ArrayAssignmentAnalyzer.php
@@ -295,7 +295,7 @@ private static function updateTypeWithKeyValues(
         $has_matching_objectlike_property = false;
         $has_matching_string = false;
 
-        $child_stmt_type = clone $child_stmt_type;
+        $child_stmt_type = $child_stmt_type->getBuilder();
 
         foreach ($child_stmt_type->getAtomicTypes() as $type) {
             if ($type instanceof TTemplateParam) {
@@ -351,7 +351,7 @@ private static function updateTypeWithKeyValues(
             }
         }
 
-        $child_stmt_type->bustCache();
+        $child_stmt_type = $child_stmt_type->freeze();
 
         if (!$has_matching_objectlike_property && !$has_matching_string) {
             if (count($key_values) === 1) {

diff --git a/src/Psalm/Type/UnionTrait.php b/src/Psalm/Type/UnionTrait.php
@@ -344,6 +344,12 @@ public function getKey(): string
         return implode('|', $types);
     }
 
+    public function bustCache(): void
+    {
+        $this->id = null;
+        $this->exact_id = null;
+    }
+
     public function getId(bool $exact = true): string
     {
         if ($exact && $this->exact_id) {