Fix usage of array_push results

vimeo · Jul 16, 2020 · a2dbd31 · a2dbd31
1 parent 262bb9f
commit a2dbd31
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArrayFunctionArgumentsAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArrayFunctionArgumentsAnalyzer.php
@@ -144,6 +144,10 @@ function ($arg) {
 
         if ($is_push && !$unpacked_args) {
             for ($i = 1; $i < count($args); $i++) {
+                $was_inside_assignment = $context->inside_assignment;
+
+                $context->inside_assignment = true;
+
                 if (ExpressionAnalyzer::analyze(
                     $statements_analyzer,
                     $args[$i]->value,
@@ -152,6 +156,8 @@ function ($arg) {
                     return false;
                 }
 
+                $context->inside_assignment = $was_inside_assignment;
+
                 $old_node_data = $statements_analyzer->node_data;
 
                 $statements_analyzer->node_data = clone $statements_analyzer->node_data;

diff --git a/src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php
@@ -147,7 +147,7 @@ public static function reconcile(
             );
         }
 
-        if ($assertion === 'null' && !$existing_var_type->isMixed()) {
+        if ($assertion === 'null' && !$existing_var_type->hasMixed()) {
             return self::reconcileNull(
                 $existing_var_type,
                 $key,
@@ -158,7 +158,7 @@ public static function reconcile(
             );
         }
 
-        if ($assertion === 'false' && !$existing_var_type->isMixed()) {
+        if ($assertion === 'false' && !$existing_var_type->hasMixed()) {
             return self::reconcileFalse(
                 $existing_var_type,
                 $key,

diff --git a/tests/UnusedCodeTest.php b/tests/UnusedCodeTest.php
@@ -736,6 +736,14 @@ function error2(array $keys, int $key): int
                         return $nextKey;
                     }'
             ],
+            'arrayPushFunctionCall' => [
+                '<?php
+                    $a = [];
+
+                    array_push($a, strlen("hello"));
+
+                    echo $a[0];'
+            ],
         ];
     }