Add null check

vimeo · Dec 11, 2019 · c27d0d9 · c27d0d9
1 parent 848cbbb
commit c27d0d9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Analyzer/TypeAnalyzer.php b/src/Psalm/Internal/Analyzer/TypeAnalyzer.php
@@ -1865,7 +1865,7 @@ private static function isMatchingTypeContainedBy(
                 $replacement_templates = [];
 
                 if ($input_template_types) {
-                    foreach ($input_template_types as $template_name => $template_type_map) {
+                    foreach ($input_template_types as $template_name => $_) {
                         if (!isset($input_type_params[$i])) {
                             break;
                         }
@@ -1918,9 +1918,11 @@ private static function isMatchingTypeContainedBy(
                                 }
                             }
 
-                            $new_input_param->replaceTemplateTypesWithArgTypes(
+                            if ($new_input_param) {
-                                $replacement_templates
+                                $new_input_param->replaceTemplateTypesWithArgTypes(
-                            );
+                                    $replacement_templates
+                                );
+                            }
 
                             $new_input_params[] = $new_input_param ?: Type::getMixed();
                         }