danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-02 09:37:59 +01:00
Code Issues Projects Releases Wiki Activity

cs-fix

Browse Source
This commit is contained in:
Daniil Gentili 2023-12-07 12:31:21 +01:00
parent dbded437ad
commit 6650bd8a57
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Psalm/Type/Reconciler.php
View File

@ -338,7 +338,12 @@ class Reconciler
if ($type_changed || $failed_reconciliation) { if ($type_changed || $failed_reconciliation) {
$changed_var_ids[$key] = true; $changed_var_ids[$key] = true;
if (substr($key, -1) === ']' && !$has_inverted_isset && !$has_inverted_key_exists && !$has_empty && !$is_equality) { if (substr($key, -1) === ']'
&& !$has_inverted_isset
&& !$has_inverted_key_exists
&& !$has_empty
&& !$is_equality
) {
self::adjustTKeyedArrayType( self::adjustTKeyedArrayType(
$key_parts, $key_parts,
$existing_types, $existing_types,
@ -728,11 +733,17 @@ class Reconciler
$new_base_type_candidate = $existing_key_type_part->type_params[1]; $new_base_type_candidate = $existing_key_type_part->type_params[1];
if ($new_base_type_candidate->isMixed() && !$has_isset && !$has_inverted_isset && !$has_inverted_key_exists) { if ($new_base_type_candidate->isMixed()
&& !$has_isset
&& !$has_inverted_isset
&& !$has_inverted_key_exists
) {
return $new_base_type_candidate; return $new_base_type_candidate;
} }
if (($has_isset || $has_inverted_isset || $has_inverted_key_exists) && isset($new_assertions[$new_base_key])) { if (($has_isset || $has_inverted_isset || $has_inverted_key_exists)
&& isset($new_assertions[$new_base_key])
) {
if ($has_inverted_isset && $new_base_key === $key) { if ($has_inverted_isset && $new_base_key === $key) {
$new_base_type_candidate = $new_base_type_candidate->getBuilder(); $new_base_type_candidate = $new_base_type_candidate->getBuilder();
$new_base_type_candidate->addType(new TNull); $new_base_type_candidate->addType(new TNull);