danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix #783 - allow ternarys to declare vars

Browse Source
This commit is contained in:
Matthew Brown 2018-05-31 21:57:17 -04:00
parent 6ecea35837
commit dda9b4e48c
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Psalm/Checker/Statements/Expression/TernaryChecker.php
View File

@ -151,10 +151,24 @@ class TernaryChecker
foreach ($t_else_context->vars_in_scope as $var_id => $type) {
if (isset($context->vars_in_scope[$var_id])) {
$context->vars_in_scope[$var_id] = Type::combineUnionTypes($context->vars_in_scope[$var_id], $type);
$context->vars_in_scope[$var_id] = Type::combineUnionTypes(
$context->vars_in_scope[$var_id],
$type
);
} elseif (isset($t_if_context->vars_in_scope[$var_id])) {
$context->vars_in_scope[$var_id] = Type::combineUnionTypes(
$t_if_context->vars_in_scope[$var_id],
$type
);
}
}
$context->vars_possibly_in_scope = array_merge(
$context->vars_possibly_in_scope,
$t_if_context->vars_possibly_in_scope,
$t_else_context->vars_possibly_in_scope
);
$context->referenced_var_ids = array_merge(
$context->referenced_var_ids,
$t_else_context->referenced_var_ids

5
tests/BinaryOperationTest.php
View File

@ -120,6 +120,11 @@ class BinaryOperationTest extends TestCase
'$d' => 'bool',
],
],
'ternaryAssignment' => [
'<?php
rand(0, 1) ? $a = 1 : $a = 2;
echo $a;',
],
];
}