From 7dfa37beb26e66734093cd3b498d98e781c9faee Mon Sep 17 00:00:00 2001
From: Brown <github@muglug.com>
Date: Sat, 11 Apr 2020 17:50:24 -0400
Subject: [PATCH] Improve ergonomics of array assignment

---
 src/Psalm/Internal/Type/TypeCombination.php |  2 +-
 tests/ArrayAssignmentTest.php               | 19 ++++++++++++++++++-
 tests/TypeCombinationTest.php               | 15 +++++++++++----
 tests/TypeReconciliation/ReconcilerTest.php |  2 +-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/Psalm/Internal/Type/TypeCombination.php b/src/Psalm/Internal/Type/TypeCombination.php
index 872430805..d6e113625 100644
--- a/src/Psalm/Internal/Type/TypeCombination.php
+++ b/src/Psalm/Internal/Type/TypeCombination.php
@@ -428,7 +428,7 @@ class TypeCombination
                     $allow_mixed_union
                 );
 
-                if ($allow_mixed_union || !$generic_type_params[1]->isMixed()) {
+                if (!$generic_type_params[1]->isMixed()) {
                     $generic_type_params[1] = Type::combineUnionTypes(
                         $generic_type_params[1],
                         $objectlike_generic_type,
diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
index db777f7b8..7404e6bfa 100644
--- a/tests/ArrayAssignmentTest.php
+++ b/tests/ArrayAssignmentTest.php
@@ -1402,9 +1402,26 @@ class ArrayAssignmentTest extends TestCase
                         $arr["hello"]["goodbye"] = 5;
                     }',
                 [
-                    '$arr' => 'array<array-key, array{goodbye: int}|mixed>',
+                    '$arr' => 'array<array-key, mixed>',
                 ]
             ],
+            'dontUpdateMixedArrayWithStringKey' => [
+                '<?php
+                    class A {}
+
+                    /**
+                     * @psalm-suppress MixedArgument
+                     */
+                    function run1(array $arguments): void {
+                        if (rand(0, 1)) {
+                            $arguments["c"] = new A();
+                        }
+
+                        if ($arguments["b"]) {
+                            echo $arguments["b"];
+                        }
+                    }',
+            ],
         ];
     }
 
diff --git a/tests/TypeCombinationTest.php b/tests/TypeCombinationTest.php
index 88535c0ee..8994ed68c 100644
--- a/tests/TypeCombinationTest.php
+++ b/tests/TypeCombinationTest.php
@@ -383,7 +383,7 @@ class TypeCombinationTest extends TestCase
                 ],
             ],
             'combineMixedArrayWithObjectLike' => [
-                'array<array-key, int|mixed>',
+                'array<array-key, mixed>',
                 [
                     'array{a: int}',
                     'array',
@@ -523,21 +523,28 @@ class TypeCombinationTest extends TestCase
                 ],
             ],
             'combineCallableArrayAndArray' => [
-                'array<array-key, mixed|string>',
+                'array<array-key, mixed>',
                 [
                     'callable-array{class-string, string}',
                     'array',
                 ],
             ],
-            'combineObjectLikeArrayAndArray' => [
+            'combineGenericArrayAndMixedArray' => [
                 'array<array-key, int|mixed>',
+                [
+                    'array<string, int>',
+                    'array<array-key, mixed>',
+                ],
+            ],
+            'combineObjectLikeArrayAndArray' => [
+                'array<array-key, mixed>',
                 [
                     'array{hello: int}',
                     'array<array-key, mixed>',
                 ],
             ],
             'combineObjectLikeArrayAndNestedArray' => [
-                'array<array-key, array{goodbye: int}|mixed>',
+                'array<array-key, mixed>',
                 [
                     'array{hello: array{goodbye: int}}',
                     'array<array-key, mixed>',
diff --git a/tests/TypeReconciliation/ReconcilerTest.php b/tests/TypeReconciliation/ReconcilerTest.php
index 46724212c..61a1b3096 100644
--- a/tests/TypeReconciliation/ReconcilerTest.php
+++ b/tests/TypeReconciliation/ReconcilerTest.php
@@ -139,7 +139,7 @@ class ReconcilerTest extends \Psalm\Tests\TestCase
             'iterableToArray' => ['array<int, int>', 'array', 'iterable<int, int>'],
             'iterableToTraversable' => ['Traversable<int, int>', 'Traversable', 'iterable<int, int>'],
             'callableToCallableArray' => ['callable-array{0: class-string|object, 1: string}', 'array', 'callable'],
-            'callableOrArrayToCallableArray' => ['array<array-key, mixed|object|string>', 'array', 'callable|array'],
+            'callableOrArrayToCallableArray' => ['array<array-key, mixed>', 'array', 'callable|array'],
             'traversableToIntersection' => ['Countable&Traversable', 'Traversable', 'Countable'],
             'iterableWithoutParamsToTraversableWithoutParams' => ['Traversable', '!array', 'iterable'],
             'iterableWithParamsToTraversableWithParams' => ['Traversable<int, string>', '!array', 'iterable<int, string>'],