From 76364ab2ccde9930513b0e3cc7e1757d3d0469f1 Mon Sep 17 00:00:00 2001 From: Bruce Weirdan Date: Thu, 1 Feb 2024 17:54:46 +0100 Subject: [PATCH 1/2] Stable baseline Fixes vimeo/psalm#10632 --- src/Psalm/ErrorBaseline.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Psalm/ErrorBaseline.php b/src/Psalm/ErrorBaseline.php index 9a83b0a2899..783ef4a8c84 100644 --- a/src/Psalm/ErrorBaseline.php +++ b/src/Psalm/ErrorBaseline.php @@ -16,7 +16,6 @@ use function array_reduce; use function array_values; use function get_loaded_extensions; -use function htmlspecialchars; use function implode; use function ksort; use function min; @@ -268,11 +267,7 @@ private static function writeToFile( foreach ($existingIssueType['s'] as $selection) { $codeNode = $baselineDoc->createElement('code'); $textContent = trim($selection); - if ($textContent !== htmlspecialchars($textContent)) { - $codeNode->appendChild($baselineDoc->createCDATASection($textContent)); - } else { - $codeNode->textContent = trim($textContent); - } + $codeNode->appendChild($baselineDoc->createCDATASection($textContent)); $issueNode->appendChild($codeNode); } $fileNode->appendChild($issueNode); From 9a970cafc3cf89cfc1cdffe5fc711f48289f07b2 Mon Sep 17 00:00:00 2001 From: Bruce Weirdan Date: Sat, 3 Feb 2024 18:15:40 +0100 Subject: [PATCH 2/2] Update our actual baseline to use the new format --- psalm-baseline.xml | 1544 ++++++++++++++++++++++---------------------- 1 file changed, 772 insertions(+), 772 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 88b88bd8c55..58202505f72 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + @@ -8,13 +8,13 @@ tags['variablesfrom'][0]]]> - $matches[1] + tags['variablesfrom'][0]]]> - $matches[1] + @@ -24,7 +24,7 @@ - !$appearing_method_id + @@ -38,19 +38,19 @@ - $const_name - $const_name - $symbol_name - $symbol_parts[1] + + + + - !$function_name + namespace]]> namespace]]> namespace]]> namespace_first_stmt_start]]> uses_end]]> - $file_path + insertText]]> symbol, '()')]]> symbol, '()')]]> @@ -71,16 +71,16 @@ - !$composer_json - !$config_path - !$file_path + + + - $cwd - $dir + + function_id]]> - $issue_handler_children - $parent_issue_type + + composer_class_loader->findFile($pluginClassName)]]> autoloader]]> localName, $offset)]]> @@ -89,7 +89,7 @@ - $suggested_dir + file_path, 'stub')]]> file_path, 'vendor')]]> @@ -99,10 +99,10 @@ - !$directory_path - !$file_path - !$glob_directory_path - !$glob_file_path + + + + directory]]> file]]> referencedClass]]> @@ -111,8 +111,8 @@ referencedMethod]]> referencedProperty]]> referencedVariable]]> - glob($parts[0], GLOB_NOSORT) - glob($parts[0], GLOB_ONLYDIR | GLOB_NOSORT) + + @@ -123,15 +123,15 @@ - $matches[1] - $matches[2] - $matches[3] + + + - $creating_conditional_id - $creating_conditional_id + + @@ -141,23 +141,23 @@ - $comments[0] - $property_name + + props[0]]]> - $uninitialized_variables[0] + - !$declaring_property_class - !$fq_class_name + + self]]> self]]> self]]> self]]> template_extended_params]]> template_types]]> - $class_template_params + initialized_class]]> - $parent_fq_class_name + getStmts()]]> getStmts()]]> template_extended_params]]> @@ -173,15 +173,15 @@ - $property_name + - !$appearing_property_class + self]]> - !$declaring_property_class + self]]> template_types]]> - $resolved_name + template_covariants]]> template_extended_params]]> template_types]]> @@ -197,13 +197,13 @@ - !$original_type + description]]> var_id]]> - !$var_type_tokens - $brackets - $template_type_map - $type_aliases + + + + line_number]]> type_end]]> type_start]]> @@ -211,27 +211,27 @@ - $namespace_name - $namespace_name + + root_file_name]]> root_file_path]]> - $namespace - $namespace + + getNamespace()]]> getStmts()]]> - $class_template_params + self]]> self]]> - $fq_class_name - $self_fq_class_name + + @@ -242,24 +242,24 @@ template_types]]> template_types]]> - $cased_method_id - $cased_method_id - $cased_method_id - $cased_method_id - $cased_method_id + + + + + self]]> self]]> self]]> self]]> self]]> - $context_self - $hash - $namespace - $parent_fqcln - $parent_fqcln + + + + + cased_name]]> template_types]]> - $template_types + function->getStmts()]]> source->getTemplateTypeMap()]]> storage->template_types]]> @@ -268,12 +268,12 @@ - !$calling_method_id + self]]> - $appearing_method_class - $appearing_method_class + + self]]> - $context_self + @@ -290,16 +290,16 @@ - $destination_parts[1] - $destination_parts[1] - $destination_parts[1] - $php_minor_version - $source_parts[1] + + + + + self]]> - $potential_file_path + @@ -318,21 +318,21 @@ - if (AtomicTypeComparator::isContainedBy( - if (AtomicTypeComparator::isContainedBy( + + var_id]]> var_id]]> - $calling_type_params + branch_point]]> template_types]]> getTemplateTypeMap()]]> line_number]]> type_end]]> type_start]]> - $var_id - $var_id + + @@ -368,13 +368,13 @@ assigned_var_ids += $switch_scope->new_assigned_var_ids]]> - !$switch_var_id + new_assigned_var_ids]]> new_vars_in_scope]]> possibly_redefined_vars]]> possibly_redefined_vars]]> redefined_vars]]> - $switch_var_id + @@ -385,11 +385,11 @@ branch_point]]> - $nested_or_options - $switch_var_id - $switch_var_id - $switch_var_id - $type_statements + + + + + @@ -404,7 +404,7 @@ - $var_id + @@ -439,135 +439,135 @@ getArgs()[0]]]> - !$var_name - !$var_type + + ')]]> - $array_root - $count_equality_position - $count_equality_position - $count_equality_position - $count_inequality_position - $count_inequality_position - $count_inequality_position - $false_position - $false_position - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name - $first_var_name_in_array_argument - $get_debug_type_position - $get_debug_type_position - $getclass_position - $getclass_position - $gettype_position - $gettype_position - $if_false_assertions - $if_true_assertions - $inferior_value_position - $other_var_name - $superior_value_position - $this_class_name - $this_class_name - $this_class_name - $true_position - $true_position - $typed_value_position - $typed_value_position - $var_id - $var_id - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name - $var_name_left - $var_name_right - $var_type - $var_type - $var_type - self::hasReconcilableNonEmptyCountEqualityCheck($conditional) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - !$parent_var_id - $object_id - $parent_var_id - $parent_var_id - $root_var_id - $root_var_id - $root_var_id - $root_var_id - $root_var_id - $var_id - $var_var_id + + + + + + + + + + + self]]> - !$var_id - $appearing_property_class - $class_template_params - $class_template_params + + + + calling_method_id]]> calling_method_id]]> self]]> self]]> self]]> - $declaring_property_class + getter_method]]> - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id - $var_property_id - $var_property_id + + + + + + + + + + + calling_method_id, '::__clone')]]> calling_method_id, '::__construct')]]> calling_method_id, '::__unserialize')]]> @@ -576,12 +576,12 @@ - $new_property_name + calling_method_id]]> - $var_id - $var_id + + @@ -590,30 +590,30 @@ ')]]> ')]]> - $assign_value_id + calling_method_id]]> - $extended_var_id - $extended_var_id - $extended_var_id - $extended_var_id - $extended_var_id - $list_var_id - $list_var_id - $list_var_id - $prop_name - $root_var_id + + + + + + + + + + line_number]]> type_end]]> type_start]]> - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id + + + + + + + + + vars_in_scope[$lhs_var_id] = &$context->vars_in_scope[$rhs_var_id]]]> @@ -626,39 +626,39 @@ - $invalid_left_messages[0] - $invalid_right_messages[0] + + branch_point]]> - $var_id + - verifyType + - $method_name - $parts[1] + + - !$container_class - $cased_method_id - $cased_method_id - $cased_method_id - $cased_method_id - $cased_method_id - $class_generic_params + + + + + + + calling_function_id]]> calling_function_id]]> calling_method_id]]> - $self_fq_class_name - $static_fq_class_name - $var_id + + + value, '::')]]> value, '::')]]> @@ -666,12 +666,12 @@ self]]> - $cased_method_id - $cased_method_id - $cased_method_id - $cased_method_id - $cased_method_id - $cased_method_id + + + + + + calling_method_id]]> calling_method_id]]> calling_method_id]]> @@ -680,48 +680,48 @@ calling_method_id]]> calling_method_id]]> sinks]]> - $function_params - $function_params - $function_params + + + template_types]]> - $method_id - $method_id - $method_id - $method_id - $var_id - $var_id - $var_id + + + + + + + getFQCLN())]]> - $args[0] - $args[0] - $args[1] - $method_name + + + + - !$container_class + calling_method_id]]> - $var_id + - !$template_types - !$template_types + + template_types]]> - $method_name - $overridden_template_types + + template_extended_params]]> template_types]]> - $function_name - $function_name + + getArgs()[0]->value]]> @@ -730,7 +730,7 @@ getArgs()[0]]]> - $parts[1] + function_id]]> @@ -745,7 +745,7 @@ - $method + self]]> @@ -764,23 +764,23 @@ calling_method_id]]> calling_method_id]]> self]]> - $lhs_var_id - $mixin_class_template_params + + - $class_template_params + calling_method_id]]> calling_method_id]]> - $lhs_var_id + template_types]]> template_types]]> - $caller_identifier + @@ -791,26 +791,26 @@ specialization_key]]> - $var_id + self]]> self]]> - $appearing_method_name + - $found_generic_params - $found_generic_params - $found_generic_params - $found_generic_params - $found_generic_params - $found_generic_params - $intersection_method_id - $intersection_method_id + + + + + + + + @@ -824,16 +824,16 @@ getFQCLN()]]> - $lhs_var_id - $lhs_var_id - $lhs_var_id + + + getFQCLN()]]> - $path_to_file - $var_id + + ')]]> @@ -842,8 +842,8 @@ calling_method_id]]> self]]> - $fq_class_name - $fq_class_name + + getFullyQualifiedFunctionMethodOrNamespaceName()]]> template_extended_params]]> template_types]]> @@ -854,7 +854,7 @@ parent_class]]> - $child_fq_class_name + calling_method_id]]> self]]> self]]> @@ -863,7 +863,7 @@ self]]> - !$fq_class_name + mixin_declaring_fqcln]]> parent_class]]> parent_class]]> @@ -874,15 +874,15 @@ - $new_method_name + self]]> self]]> self]]> self]]> - $found_generic_params - $found_generic_params + + template_extended_params]]> @@ -892,9 +892,9 @@ items[1]]]> - !$arg_var_id - $arg_var_id - $assertion_var_id + + + template_extended_params]]> self]]> self]]> @@ -905,8 +905,8 @@ - $new_const_name - $new_const_name + + self]]> @@ -920,101 +920,101 @@ - !$lhs_var_name - !$object_id - !$object_id - !$this_class_name - $object_id - $property_root - $resolved_name - $resolved_name - $root_var_id - $this_class_name + + + + + + + + + + - $stmt_type - $stmt_type - $stmt_type + + + - $dim_var_id - $dim_var_id - $extended_var_id - $extended_var_id - $keyed_array_var_id - $keyed_array_var_id - $keyed_array_var_id - $keyed_array_var_id + + + + + + + + - $stmt_type + self]]> self]]> - $declaring_property_class - $declaring_property_class + + template_types]]> template_types]]> - $var_id - $var_id - $var_property_id - $var_property_id + + + + - $invalid_fetch_types[0] + - !$prop_name + calling_method_id]]> calling_method_id]]> - $declaring_property_class - $stmt_var_id - $var_id - $var_id + + + + - $new_property_name + - !$prop_name + calling_method_id]]> calling_method_id]]> calling_method_id]]> self]]> - $string_type - $var_id - $var_id + + + - $branch_point - $branch_point + + - $var_id + - !$evaled_path - !$var_id - $include_path - $left_string - $path_to_file - $right_string - $var_id + + + + + + + @@ -1024,13 +1024,13 @@ - !$switch_var_id - $switch_var_id + + - $fq_classlike_name + @@ -1046,7 +1046,7 @@ var_id]]> - $class_template_params + declaring_yield_fqcn]]> self]]> line_number]]> @@ -1056,7 +1056,7 @@ - $method_name + calling_function_id]]> @@ -1064,7 +1064,7 @@ var_id]]> calling_function_id]]> self]]> - $found_generic_params + line_number]]> type_end]]> type_start]]> @@ -1072,20 +1072,20 @@ - $root_var_id - $var_id + + - $token_list[$iter] + - $token_list[$iter] - $token_list[$iter] - $token_list[$iter] - $token_list[$iter] - $token_list[0] + + + + + @@ -1093,17 +1093,17 @@ expr->getArgs()[0]]]> - $branch_point - $new_issues + + getNamespace()]]> - $possible_traced_variable_names + fake_this_class]]> vars_to_initialize]]> - !$root_path + @@ -1113,45 +1113,45 @@ error_baseline]]> - !$paths_to_check - !$root_path + + - $baseline_file_path - $cache_directory + + threads]]> - $find_references_to - empty($baselineFile) + + - !$root_path - $paths_to_check + + - $identifier_name + - !$last_arg - !$last_arg - !$last_arg - !$root_path + + + + - !$config_file - !$end_psalm_open_tag - !$path_to_check + + + error_baseline]]> - $f_paths - $path_to_config - $stdin = fgets(STDIN) + + + getPHPVersionFromComposerJson()]]> getPhpVersionFromConfig()]]> @@ -1159,7 +1159,7 @@ - $trait + @@ -1167,39 +1167,39 @@ - $destination_name - $destination_name - $destination_name - $source_const_name - $stub + + + + + - !$calling_fq_class_name - !$insert_pos - !$insert_pos - !$insert_pos - $calling_fq_class_name - $calling_fq_class_name - $calling_fq_class_name - $calling_fq_class_name - $calling_fq_class_name - $calling_fq_class_name - $calling_fq_class_name - $calling_fq_class_name - $calling_fq_class_name - $calling_fq_class_name - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id - $file_path - $file_path - $file_path - $file_path - $file_path - $migrated_source_fqcln - $migrated_source_fqcln + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1209,50 +1209,50 @@ - $stub + - !$checked_file_path - !$root_file_path - $args + + + cased_name]]> - $namespace + - !$return_type_string + - !$calling_class_name - !$extends - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id - $found_generic_params - $old_method_id - $source_file_path - $source_file_path - $source_file_path - $source_file_path - $source_file_path - $source_file_path - $source_file_path - $source_file_path + + + + + + + + + + + + + + + + + + + + + - $mapped_name + template_extended_params]]> template_extended_params]]> template_extended_params]]> @@ -1262,12 +1262,12 @@ - $property_name - $property_name - $property_name - $property_name - $property_name - $property_name + + + + + + calling_method_id]]> @@ -1277,7 +1277,7 @@ - $composer_file_path + cased_name]]> cased_name]]> @@ -1299,17 +1299,17 @@ - $specialization_key + props[0]]]> stmts[0]]]> - $a_stmt_comments[0] + props[0]]]> stmts[0]]]> - $b_stmt_comments[0] + stmts]]> @@ -1318,7 +1318,7 @@ - $b[$y] + @@ -1328,21 +1328,21 @@ - $exploded[1] - $url + + - $var_end - $var_start + + new_php_return_type]]> - $last_arg_position + new_php_return_type]]> new_phpdoc_return_type]]> return_typehint_colon_start]]> @@ -1350,7 +1350,7 @@ return_typehint_end]]> return_typehint_start]]> return_typehint_start]]> - $php_type + new_phpdoc_return_type]]> new_psalm_return_type]]> return_type_description]]> @@ -1369,7 +1369,7 @@ typehint_end]]> typehint_start]]> typehint_start]]> - $preceding_semicolon_pos + new_phpdoc_type]]> new_psalm_type]]> type_description]]> @@ -1377,7 +1377,7 @@ - !$sockets + @@ -1387,7 +1387,7 @@ - empty($message) + @@ -1395,39 +1395,39 @@ TCPServerAddress]]> TCPServerAddress]]> onchangeLineLimit]]> - empty($additional_info) + - $method_id_parts[1] + - $arg_var_id - $arg_var_id - $left_var_id - $left_var_id - $right_var_id - $right_var_id - $var_id - $var_id + + + + + + + + - $cs[0] - $match[0] - $match[1] - $match[2] + + + + stmts[0]]]> - $replacement_stmts[0] - $replacement_stmts[0] - $replacement_stmts[0] + + + - !$method_contents + parser->parse( $hacky_class_fix, $error_handler, @@ -1440,25 +1440,25 @@ - $doc_line_parts[1] - $matches[0] + + children[0]]]> children[1]]]> - !$method_entry + - $l[4] - $r[4] + + - !$var_line_parts + newModifier]]> - $class_name + description]]> inheritors]]> yield]]> @@ -1478,10 +1478,10 @@ - $fq_classlike_name - $string_value - $string_value - $string_value + + + + @@ -1490,15 +1490,15 @@ getArgs()[1]]]> - !$skip_if_descendants - !$skip_if_descendants - $include_path - $path_to_file + + + + - $since_parts[1] + 0]]> @@ -1506,7 +1506,7 @@ - $source_param_string + namespace]]> @@ -1521,9 +1521,9 @@ template_types]]> template_types]]> template_types]]> - $template_types - $template_types - $template_types + + + @@ -1535,10 +1535,10 @@ aliases->namespace]]> aliases->namespace]]> template_types]]> - $fq_classlike_name - $function_id - $function_id - $method_name_lc + + + + stmts]]> stmts]]> stmts]]> @@ -1549,7 +1549,7 @@ - $type_string + @@ -1570,17 +1570,17 @@ - $cs[0] + - $offset_map + end_change]]> start_change]]> - $config_file_path !== null + getArgument('pluginName')]]> @@ -1589,7 +1589,7 @@ - $config_file_path !== null + getArgument('pluginName')]]> @@ -1598,7 +1598,7 @@ - $config_file_path !== null + getOption('config')]]> @@ -1606,8 +1606,8 @@ - !$path - $explicit_path + + psalm_header]]> psalm_tag_end_pos]]> @@ -1619,17 +1619,17 @@ - !$root_cache_directory - $file_contents - $file_path + + + - !$cache_directory - !$cache_directory - !$cache_directory - $cache_directory + + + + @@ -1639,88 +1639,88 @@ - !$root_cache_directory + - $result + - $called_method_name + - $extended_var_id + - !$cache_directory - !$root_cache_directory - !$root_cache_directory - !$root_cache_directory + + + + - !$cache_directory - !$cache_directory + + composer_lock_hash]]> - $cache_directory + - !$key_column_name + - $callable_extended_var_id + getTemplateTypeMap()]]> getTemplateTypeMap()]]> - $callable_method_name + - $class_strings ?: null + - $method_name + - $fetch_class_name + - !$call_args + - $existing_file_contents - $existing_file_contents - $existing_file_contents - $existing_statements - $existing_statements - $existing_statements - $existing_statements - $file_changes - $file_path + + + + + + + + + parse($file_contents, $error_handler)]]> parse($file_contents, $error_handler)]]> @@ -1728,14 +1728,14 @@ - $first_line_padding + - !$resolved_name - $mapped_type = $map[$offset_arg_value] ?? null - $mapped_type = $map[$offset_arg_value] ?? null + + + @@ -1757,19 +1757,19 @@ - $key - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id - $var_id + + + + + + + + - isContainedBy + properties[0]]]> @@ -1778,106 +1778,106 @@ - $callable + - TCallable|TClosure|null + - !$class_name - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id - $calling_method_id + + + + + + params]]> - $file_name - $file_name - $input_variadic_param_idx - $member_id + + + + - !($container_type_params_covariant[$i] ?? false) + - $intersection_container_type_lower + - $key - $key - $key + + + properties[0]]]> - $properties[0] - $properties[0] - $properties[0] + + + - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $var_id - $var_id - $var_id - $var_id + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - !$count - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $key - $var_id - $var_id - $var_id - $var_id + + + + + + + + + + + + + + + + + + + + + + @@ -1887,12 +1887,12 @@ - getClassTemplateTypes + - $input_template_types + template_extended_params[$container_class])]]> template_extended_params[$base_type->as_type->value])]]> template_extended_params[$base_type->value])]]> @@ -1931,60 +1931,60 @@ value_types['string'] instanceof TNonFalsyString ? $type->value : $type->value !== '']]> - $shared_classlikes + - $fallback_params + template_types]]> - $params - $parent_class - $self_class - $self_class - $self_class - $self_class - $self_class - $self_class - $static_class_type + + + + + + + + + - $const_name - $const_name + + children[0]]]> condition->children[0]]]> - array_keys($offset_template_data)[0] - array_keys($template_type_map[$array_param_name])[0] - array_keys($template_type_map[$class_name])[0] - array_keys($template_type_map[$fq_classlike_name])[0] - array_keys($template_type_map[$template_param_name])[0] + + + + + - $extra_params + value, '::')]]> value, '::')]]> - $type_tokens[$i - 1] - $type_tokens[$i - 1] - $type_tokens[$i - 1] - $type_tokens[$i - 1] + + + + - $parent_fqcln - $self_fqcln + + - !$fq_classlike_name + template_types]]> template_types]]> calling_method_id]]> @@ -1992,23 +1992,23 @@ - $function_id + - $function_id + - $function_id + output_path]]> - $parent_issue_type + @@ -2032,47 +2032,47 @@ - CustomMetadataTrait + - traverse - traverse - traverse - traverse + + + + - $this_var_id + - !$namespace - $namespace - $namespace + + + - classOrInterfaceExists - classOrInterfaceExists - classOrInterfaceExists - getMappedGenericTypeParams - interfaceExtends - interfaceExtends - interfaceExtends - traverse - traverse + + + + + + + + + - array_keys($template_type_map[$value])[0] + - $value + @@ -2080,54 +2080,54 @@ - replace - replace - replace - replace + + + + - $params - $params + + - getMappedGenericTypeParams - replace - replace + + + type_params[1]]]> - !($container_type_params_covariant[$offset] ?? true) + - getMostSpecificTypeFromBounds + - TNonEmptyList + - replace + - !$namespace - $namespace + + - getString - getString - replace - replace + + + + value_param]]> @@ -2135,51 +2135,51 @@ - !$intersection - !$intersection + + - replace + - __construct + - !$intersection - !$intersection + + - !$intersection + - TList + getGenericValueType())]]> getGenericValueType())]]> - combine - combine - combineUnionTypes - combineUnionTypes - combineUnionTypes - combineUnionTypes - combineUnionTypes - combineUnionTypes - combineUnionTypes - replace - replace - replace - replace + + + + + + + + + + + + + possibly_undefined]]> @@ -2189,13 +2189,13 @@ properties[0]]]> - getList + - replace - replace + + type_param]]> @@ -2203,52 +2203,52 @@ - !$namespace - $namespace + + - !$intersection - $intersection + + - TList + - setCount + - replace - replace + + - !$intersection - !$intersection + + - replace + - !$intersection + - replace + - replace + @@ -2258,13 +2258,13 @@ - $allow_mutations - $by_ref - $failed_reconciliation - $from_template_default - $has_mutations - $initialized_class - $reference_free + + + + + + + @@ -2272,13 +2272,13 @@ - $const_name + - $array_key_offset - $failed_reconciliation + + ')]]> @@ -2287,40 +2287,40 @@ - $node + - visit + - $ignore_isset + - traverse - traverse - traverseArray - traverseArray + + + + - TArray|TKeyedArray|TClassStringMap + types['array']]]> - allFloatLiterals - allFloatLiterals - hasLowercaseString - hasLowercaseString + + + + - !$php_type + exact_id]]> id]]> exact_id]]> @@ -2337,8 +2337,8 @@ - $level - $php_version + + @@ -2349,11 +2349,11 @@ - $param_type_1 - $param_type_2 - $param_type_3 - $param_type_4 - $return_type + + + + +