Fix issues found with Vimeo’s code

vimeo · May 11, 2020 · 48da7a4 · 48da7a4
1 parent f3a6e1a
commit 48da7a4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
@@ -588,7 +588,13 @@ public static function analyze(
                         && !$assign_value_type->hasArrayAccessInterface($codebase)
                     ) {
                         if ($assign_value_type->hasArray()) {
-                            if (IssueBuffer::accepts(
+                            if (($assign_value_atomic_type instanceof Type\Atomic\TFalse
+                                    && $assign_value_type->ignore_falsable_issues)
+                                || ($assign_value_atomic_type instanceof Type\Atomic\TNull
+                                    && $assign_value_type->ignore_nullable_issues)
+                            ) {
+                                // do nothing
+                            } elseif (IssueBuffer::accepts(
                                 new PossiblyInvalidArrayAccess(
                                     'Cannot access array value on non-array variable '
                                         . $array_var_id . ' of type ' . $assign_value_atomic_type->getId(),

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
@@ -2783,6 +2783,10 @@ public static function checkFunctionArgumentType(
             $codebase->analyzer->incrementNonMixedCount($statements_analyzer->getFilePath());
         }
 
+        if ($function_param->by_ref) {
+            $param_type->possibly_undefined = true;
+        }
+
         $param_type = TypeAnalyzer::simplifyUnionType(
             $codebase,
             $param_type
@@ -3810,7 +3814,10 @@ protected static function applyAssertionsToContext(
 
                     $codebase = $statements_analyzer->getCodebase();
 
-                    if ($first_appearance && $context->vars_in_scope[$var_id]->hasMixed()) {
+                    if ($first_appearance
+                        && isset($context->vars_in_scope[$var_id])
+                        && $context->vars_in_scope[$var_id]->hasMixed()
+                    ) {
                         if (!$context->collect_initializations
                             && !$context->collect_mutations
                             && $statements_analyzer->getFilePath() === $statements_analyzer->getRootFilePath()

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/PropertyFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/PropertyFetchAnalyzer.php
@@ -616,7 +616,7 @@ public static function analyzeInstance(
                     continue;
                 }
 
-                if ($interface_exists) {
+                if (!$class_exists) {
                     $property_id = $lhs_type_part->value . '::$' . $prop_name;
 
                     if (IssueBuffer::accepts(