Don’t overwrite true flag

vimeo · Oct 19, 2020 · 9e3b069 · 9e3b069
1 parent db119d6
commit 9e3b069
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
@@ -1166,7 +1166,7 @@ private static function coerceValueAfterGatekeeperArgument(
                 }
             }
 
-            if ($context->inside_conditional) {
+            if ($context->inside_conditional && !isset($context->assigned_var_ids[$var_id])) {
                 $context->assigned_var_ids[$var_id] = false;
             }
 

diff --git a/tests/TypeReconciliation/ConditionalTest.php b/tests/TypeReconciliation/ConditionalTest.php
@@ -1902,6 +1902,33 @@ function exampleWithOr($value): O {
                         return $value;
                     }'
             ],
+            'assertVarRedefinedInIfWithOrAndConversion' => [
+                '<?php
+                    interface Convertor {
+                        function maybeConvert(string $value): ?SomeObject;
+                    }
+
+                    interface SomeObject
+                    {
+                        function isValid(): bool;
+                    }
+
+                    /**
+                     * @param mixed $value
+                     */
+                    function exampleWithOr(Convertor $convertor, $value): SomeObject
+                    {
+                        if (
+                          !\is_string($value)
+                          || ($value = $convertor->maybeConvert($value)) === null
+                          || !$value->isValid()
+                        ) {
+                            throw new Exception();
+                        }
+
+                        return $value;
+                    }'
+            ],
             'assertVarRedefinedInIfWithExtraIf' => [
                 '<?php
                     class O {}