Merge pull request #10207 from boesing/bugfix/issue-10203

Allow object assertions for `mixed` values
vimeo · Sep 28, 2023 · a843c30 · a843c30
2 parents d7236ef + 3e100b1
commit a843c30
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -1600,7 +1600,7 @@ private static function reconcileObject(
         bool $is_equality
     ): Union {
         if ($existing_var_type->hasMixed()) {
-            return Type::getObject();
+            return new Union([$assertion_type]);
         }
 
         $old_var_type_string = $existing_var_type->getId();

diff --git a/tests/AssertAnnotationTest.php b/tests/AssertAnnotationTest.php
@@ -2967,6 +2967,22 @@ final class Qoo extends AbstractSingleInstancePluginManager
                 'ignored_issues' => [],
                 'php_version' => '8.1',
             ],
+            'objectShapeAssertion' => [
+                'code' => '<?php
+                    /** @psalm-assert object{foo:string,bar:int} $value */
+                    function assertObjectShape(mixed $value): void
+                    {}
+
+                    /** @var mixed $value */
+                    $value = null;
+                    assertObjectShape($value);
+                ',
+                'assertions' => [
+                    '$value===' => 'object{foo:string, bar:int}',
+                ],
+                'ignored_issues' => [],
+                'php_version' => '8.0',
+            ],
         ];
     }