Merge pull request #6089 from orklah/getTypeResourceClosed

Fix usage of gettype in a switch with closed resource
vimeo · Jul 14, 2021 · 09b0167 · 09b0167
2 parents 601c8ca + 0bd8b03
commit 09b0167
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -2381,7 +2381,15 @@ private static function getGettypeInequalityAssertions(
             }
         } else {
             if ($var_name && $var_type) {
-                $if_types[$var_name] = [['!' . $var_type]];
+                if ($var_type === 'class@anonymous') {
+                    $if_types[$var_name] = [['!=object']];
+                } elseif ($var_type === 'resource (closed)') {
+                    $if_types[$var_name] = [['!closed-resource']];
+                } elseif (substr($var_type, 0, 10) === 'resource (') {
+                    $if_types[$var_name] = [['!=resource']];
+                } else {
+                    $if_types[$var_name] = [['!' . $var_type]];
+                }
             }
         }
 
@@ -3054,7 +3062,15 @@ private static function getGettypeEqualityAssertions(
             }
         } else {
             if ($var_name && $var_type) {
-                $if_types[$var_name] = [[$var_type]];
+                if ($var_type === 'class@anonymous') {
+                    $if_types[$var_name] = [['=object']];
+                } elseif ($var_type === 'resource (closed)') {
+                    $if_types[$var_name] = [['closed-resource']];
+                } elseif (substr($var_type, 0, 10) === 'resource (') {
+                    $if_types[$var_name] = [['=resource']];
+                } else {
+                    $if_types[$var_name] = [[$var_type]];
+                }
             }
         }
 

diff --git a/tests/FunctionCallTest.php b/tests/FunctionCallTest.php
@@ -792,6 +792,15 @@ function matchesTypes($maybe) : void {
                         if ($t === "object") {}
                     }',
             ],
+            'getTypeSwitchClosedResource' => [
+                '<?php
+                    $data = "foo";
+                    switch (gettype($data)) {
+                        case "resource (closed)":
+                        case "unknown type":
+                            return "foo";
+                    }',
+            ],
             'functionResolutionInNamespace' => [
                 '<?php
                     namespace Foo;