danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix reconciliation of non-isset array vars

Browse Source
This commit is contained in:
Matt Brown 2018-05-07 16:00:56 -04:00
parent c6ed1b0458
commit 091d13b73f
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,8 +59,8 @@ class Reconciler
CodeLocation $code_location = null, CodeLocation $code_location = null,
array $suppressed_issues = [] array $suppressed_issues = []
) { ) {
foreach ($new_types as $nk => $_) { foreach ($new_types as $nk => $type) {
if (strpos($nk, '[')) { if (strpos($nk, '[') && ($type === '^isset' || $type === '!^empty')) {
$path_parts = self::breakUpPathIntoParts($nk); $path_parts = self::breakUpPathIntoParts($nk);
if (count($path_parts) > 1) { if (count($path_parts) > 1) {

47
tests/ValueTest.php
View File

@ -153,15 +153,58 @@ class ValueTest extends TestCase
takesInt($i); takesInt($i);
}', }',
], ],
'regularStringComparison' => [ 'regularComparison1' => [
'<?php '<?php
function foo(string $s1, string $s2) : string { function foo(string $s1, string $s2, ?int $i) : string {
if ($s1 !== $s2) { if ($s1 !== $s2) {
return $s1; return $s1;
} }
return $s2; return $s2;
}', }',
], ],
'regularComparison2' => [
'<?php
function foo(string $s1, string $s2) : string {
if ($s1 !== "hello") {
if ($s1 !== "goodbye") {
return $s1;
}
}
return $s2;
}',
],
'regularComparison3' => [
'<?php
class A {
const B = 1;
const C = 2;
}
function foo(string $s1, string $s2, ?int $i) : string {
if ($i !== A::B && $i !== A::C) {}
return $s2;
}',
],
'regularComparisonOnPossiblyNull' => [
'<?php
/** @psalm-ignore-nullable-return */
function generate() : ?string {
return rand(0, 1000) ? "hello" : null;
}
function foo() : string {
$str = generate();
if ($str[0] === "h") {
return $str;
}
return "hello";
}',
],
]; ];
} }