Ignore just-coerced vars

vimeo · Oct 19, 2020 · eee562c · eee562c
1 parent 45326b0
commit eee562c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/IfAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/IfAnalyzer.php
@@ -2002,6 +2002,13 @@ public static function addConditionallyAssignedVarsToContext(
         Context $outer_context,
         array $cond_assigned_var_ids
     ) : void {
+        // this filters out coercions to expeccted types in ArgumentAnalyzer
+        $cond_assigned_var_ids = \array_filter($cond_assigned_var_ids);
+
+        if (!$cond_assigned_var_ids) {
+            return;
+        }
+
         $exprs = self::getDefinitelyEvaluatedOredExpressions($cond);
 
         // if there was no assignment in the first expression it's safe to proceed

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
@@ -1167,7 +1167,7 @@ private static function coerceValueAfterGatekeeperArgument(
             }
 
             if ($context->inside_conditional) {
-                $context->assigned_var_ids[$var_id] = true;
+                $context->assigned_var_ids[$var_id] = false;
             }
 
             if ($was_cloned) {

diff --git a/tests/TypeReconciliation/ConditionalTest.php b/tests/TypeReconciliation/ConditionalTest.php
@@ -2856,6 +2856,21 @@ function bar(App $foo, $arr) : void {
                         }
                     }'
             ],
+            'nonRedundantConditionAfterThing' => [
+                '<?php
+                    class U {
+                        public function takes(self $u) : bool {
+                            return true;
+                        }
+                    }
+
+                    function bar(?U $a, ?U $b) : void {
+                        if ($a === null
+                            || ($b !== null && $a->takes($b))
+                            || $b === null
+                        ) {}
+                    }'
+            ],
         ];
     }