From fd4ced42a7332287d5750810665e2d2290ab2817 Mon Sep 17 00:00:00 2001
From: Brown <github@muglug.com>
Date: Fri, 31 Jul 2020 12:44:01 -0400
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20register=20new=20assignment=20i?=
 =?UTF-8?q?nside=20isset=20expr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Expression/AssignmentAnalyzer.php          |  2 +-
 tests/ArrayAssignmentTest.php                  |  5 +----
 tests/PropertyTypeTest.php                     | 18 ++++++++++++++++++
 tests/TypeReconciliation/ValueTest.php         |  8 +++++---
 tests/UnusedCodeTest.php                       | 17 -----------------
 tests/UnusedVariableTest.php                   | 17 +++++++++++++++++
 6 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
index 1af668253..b96698d90 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
@@ -365,7 +365,7 @@ class AssignmentAnalyzer
                             $location,
                             $context->branch_point
                         );
-                    } else {
+                    } elseif (!$context->inside_isset) {
                         $statements_analyzer->registerVariableAssignment(
                             $var_id,
                             $location
diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
index ac900ce1a..c7598da90 100644
--- a/tests/ArrayAssignmentTest.php
+++ b/tests/ArrayAssignmentTest.php
@@ -997,10 +997,7 @@ class ArrayAssignmentTest extends TestCase
                     $a = [];
 
                     foreach (["one", "two", "three"] as $key) {
-                      /**
-                       * @psalm-suppress MixedOperand
-                       */
-                      $a[$key] += rand(0, 10);
+                        $a[$key] += rand(0, 10);
                     }
 
                     $a["four"] = true;
diff --git a/tests/PropertyTypeTest.php b/tests/PropertyTypeTest.php
index 6abe66cd0..ad4349553 100644
--- a/tests/PropertyTypeTest.php
+++ b/tests/PropertyTypeTest.php
@@ -2023,6 +2023,24 @@ class PropertyTypeTest extends TestCase
                         }
                     }'
             ],
+            'staticPropertyAssertion' => [
+                '<?php
+                    class Foo {
+                        /** @var int */
+                        private static $transactionDepth;
+
+                        function bar(): void {
+                            if (self::$transactionDepth === 0) {
+                            } else {
+                                --self::$transactionDepth;
+
+                                if (self::$transactionDepth === 0) {
+
+                                }
+                            }
+                        }
+                    }'
+            ],
         ];
     }
 
diff --git a/tests/TypeReconciliation/ValueTest.php b/tests/TypeReconciliation/ValueTest.php
index 41d442f03..ca9b2a722 100644
--- a/tests/TypeReconciliation/ValueTest.php
+++ b/tests/TypeReconciliation/ValueTest.php
@@ -233,12 +233,14 @@ class ValueTest extends TestCase
                 '<?php
                     $i = 0;
                     $a = function() use (&$i) : void {
-                      if (rand(0, 1)) $i++;
+                        if (rand(0, 1)) {
+                            $i++;
+                        }
                     };
                     $a();
                     if ($i === 0) {}',
                 'assertions' => [],
-                'error_levels' => ['MixedOperand'],
+                'error_levels' => ['MixedOperand', 'MixedAssignment'],
             ],
             'incrementMixedCall' => [
                 '<?php
@@ -250,7 +252,7 @@ class ValueTest extends TestCase
                         if ($i === 0) {}
                     }',
                 'assertions' => [],
-                'error_levels' => ['MissingParamType', 'MixedMethodCall', 'MixedOperand'],
+                'error_levels' => ['MissingParamType', 'MixedMethodCall', 'MixedOperand', 'MixedAssignment'],
             ],
             'regularValueReconciliation' => [
                 '<?php
diff --git a/tests/UnusedCodeTest.php b/tests/UnusedCodeTest.php
index 2aa473ba3..11c0a4b19 100644
--- a/tests/UnusedCodeTest.php
+++ b/tests/UnusedCodeTest.php
@@ -719,23 +719,6 @@ class UnusedCodeTest extends TestCase
                     $methodRef = "\A::b";
                     $methodRef();',
             ],
-            'doArrayIncrement' => [
-                '<?php
-                    /**
-                     * @param list<int> $keys
-                     * @param int $key
-                     */
-                    function error2(array $keys, int $key): int
-                    {
-                        if ($key === 1) {}
-
-                        do {
-                            $nextKey = $keys[++$key] ?? null;
-                        } while ($nextKey === null);
-
-                        return $nextKey;
-                    }'
-            ],
             'arrayPushFunctionCall' => [
                 '<?php
                     $a = [];
diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
index 4e4b18bb2..7448faa7e 100644
--- a/tests/UnusedVariableTest.php
+++ b/tests/UnusedVariableTest.php
@@ -1461,6 +1461,23 @@ class UnusedVariableTest extends TestCase
                         return $i + 1;
                     }'
             ],
+            'doArrayIncrement' => [
+                '<?php
+                    /**
+                     * @param list<int> $keys
+                     * @param int $key
+                     */
+                    function error2(array $keys, int $key): int
+                    {
+                        if ($key === 1) {}
+
+                        do {
+                            $nextKey = $keys[++$key] ?? null;
+                        } while ($nextKey === null);
+
+                        return $nextKey;
+                    }'
+            ],
         ];
     }