Merge pull request #9541 from weirdan/mixed-types-coercion

vimeo · Mar 19, 2023 · b381f47 · b381f47
2 parents c2c2e26 + b25f2e6
commit b381f47
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/Psalm/Internal/Type/Comparator/AtomicTypeComparator.php b/src/Psalm/Internal/Type/Comparator/AtomicTypeComparator.php
@@ -26,6 +26,7 @@
 use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Atomic\TNever;
 use Psalm\Type\Atomic\TNonEmptyArray;
+use Psalm\Type\Atomic\TNonEmptyMixed;
 use Psalm\Type\Atomic\TNull;
 use Psalm\Type\Atomic\TObject;
 use Psalm\Type\Atomic\TObjectWithProperties;
@@ -87,8 +88,11 @@ public static function isContainedBy(
                 && !$container_type_part->extra_types
                 && $input_type_part instanceof TMixed)
         ) {
-            if (get_class($container_type_part) === TEmptyMixed::class
-                && get_class($input_type_part) === TMixed::class
+            if (get_class($input_type_part) === TMixed::class
+                && (
+                    get_class($container_type_part) === TEmptyMixed::class
+                    || get_class($container_type_part) === TNonEmptyMixed::class
+                )
             ) {
                 if ($atomic_comparison_result) {
                     $atomic_comparison_result->type_coerced = true;

diff --git a/src/Psalm/Internal/Type/Comparator/UnionTypeComparator.php b/src/Psalm/Internal/Type/Comparator/UnionTypeComparator.php
@@ -44,7 +44,7 @@ public static function isContainedBy(
         bool $allow_interface_equality = false,
         bool $allow_float_int_equality = true
     ): bool {
-        if ($container_type->isMixed()) {
+        if ($container_type->isVanillaMixed()) {
             return true;
         }
 
@@ -63,9 +63,6 @@ public static function isContainedBy(
             return false;
         }
 
-        if ($container_type->hasMixed() && !$container_type->isEmptyMixed()) {
-            return true;
-        }
 
         $container_has_template = $container_type->hasTemplateOrStatic();
 

diff --git a/tests/TypeComparatorTest.php b/tests/TypeComparatorTest.php
@@ -173,5 +173,9 @@ public function getUnsuccessfulComparisons(): iterable
             'list<int>',
             'array{int, string}',
         ];
+        yield 'nonEmptyMixedDoesNotAcceptMixed' => [
+            'non-empty-mixed',
+            'mixed',
+        ];
     }
 }