danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix #4479 - use correct keys in message

Browse Source
This commit is contained in:
Matt Brown 2020-11-05 10:13:08 -05:00
parent e9dd16f336
commit d47d817843
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php
View File

@ -987,15 +987,27 @@ class ArrayFetchAnalyzer
if ($type->sealed || !$context->inside_isset) {
$object_like_keys = array_keys($type->properties);
if (count($object_like_keys) === 1) {
$expected_keys_string = '\'' . $object_like_keys[0] . '\'';
} else {
$last_key = array_pop($object_like_keys);
$expected_keys_string = '\'' . implode('\', \'', $object_like_keys) .
'\' or \'' . $last_key . '\'';
$last_key = array_pop($object_like_keys);
$key_string = '';
if ($object_like_keys) {
$formatted_keys = implode(
', ',
array_map(
function($key) {
return is_int($key) ? $key : '\'' . $key . '\'';
},
$object_like_keys
)
);
$key_string = $formatted_keys . ' or ';
}
$expected_offset_types[] = $expected_keys_string;
$key_string .= is_int($last_key) ? $last_key : '\'' . $last_key . '\'';
$expected_offset_types[] = $key_string;
}
$array_access_type = Type::getMixed();
@ -1447,8 +1459,7 @@ class ArrayFetchAnalyzer
$used_offset = 'using a ' . $offset_type->getId() . ' offset';
if ($key_values) {
$used_offset = 'using offset value of '
. (is_int($key_values[0]) ? $key_values[0] : '\'' . $key_values[0] . '\'');
$used_offset = 'using offset value of ' . implode('|', $key_values);
}
if ($has_valid_offset && $context->inside_isset) {

15
tests/ConstantTest.php
View File

@ -1198,6 +1198,21 @@ class ConstantTest extends TestCase
',
'error_message' => 'InvalidArgument'
],
'correctMessage' => [
'<?php
class S {
public const ZERO = 0;
public const ONE = 1;
}
/**
* @param S::* $s
*/
function foo(int $s): string {
return [1 => "a", 2 => "b"][$s];
}',
'error_message' => 'offset value of 1|0'
],
];
}
}