Allow multiple method_exists checks to inform type

vimeo · Aug 19, 2019 · a3e9dec · a3e9dec
1 parent 920c2d8
commit a3e9dec
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Type/AssertionReconciler.php b/src/Psalm/Internal/Type/AssertionReconciler.php
@@ -800,7 +800,7 @@ private static function reconcileNonEmptyCountable(
      */
     private static function reconcileHasMethod(
         Codebase $codebase,
-        string $method_id,
+        string $method_name,
         Union $existing_var_type,
         ?string $key,
         ?CodeLocation $code_location,
@@ -819,18 +819,25 @@ private static function reconcileHasMethod(
             ) {
                 $object_types[] = $type;
 
-                if (!$codebase->methodExists($type->value . '::' . $method_id)) {
+                if (!$codebase->methodExists($type->value . '::' . $method_name)) {
                     $obj = new Atomic\TObjectWithProperties(
                         [],
-                        [$method_id => $type->value . '::' . $method_id]
+                        [$method_name => $type->value . '::' . $method_name]
                     );
                     $type->extra_types[$obj->getKey()] = $obj;
                     $did_remove_type = true;
                 }
+            } elseif ($type instanceof Atomic\TObjectWithProperties) {
+                $object_types[] = $type;
+
+                if (!isset($type->methods[$method_name])) {
+                    $type->methods[$method_name] = 'object::' . $method_name;
+                    $did_remove_type = true;
+                }
             } elseif ($type instanceof TObject || $type instanceof TMixed) {
                 $object_types[] = new Atomic\TObjectWithProperties(
                     [],
-                    [$method_id =>  'object::' . $method_id]
+                    [$method_name =>  'object::' . $method_name]
                 );
                 $did_remove_type = true;
             } elseif ($type instanceof TTemplateParam) {
@@ -847,7 +854,7 @@ private static function reconcileHasMethod(
                     $existing_var_type,
                     $old_var_type_string,
                     $key,
-                    'object with method ' . $method_id,
+                    'object with method ' . $method_name,
                     !$did_remove_type,
                     $code_location,
                     $suppressed_issues

diff --git a/tests/MethodCallTest.php b/tests/MethodCallTest.php
@@ -366,6 +366,19 @@ function foo(A $a) : void {
                         }
                     }'
             ],
+            'callManyMethodsAfterCheckingExistence' => [
+                '<?php
+                    function foo(object $object) : void {
+                        if (!method_exists($object, "foo")) {
+                            return;
+                        }
+                        if (!method_exists($object, "bar")) {
+                            return;
+                        }
+                        $object->foo();
+                        $object->bar();
+                    }'
+            ],
         ];
     }