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

Don’t modify object after unnecessary assertion

Browse Source
This commit is contained in:
Brown 2020-08-16 23:38:50 -04:00
parent 7adc25c421
commit 11f170acb4
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Psalm/Internal/Type/Comparator/ObjectComparator.php
View File

@ -124,7 +124,7 @@ class ObjectComparator
);
}
foreach ($intersection_input_types as $intersection_input_type) {
foreach ($intersection_input_types as $intersection_input_key => $intersection_input_type) {
$input_was_static = false;
if ($intersection_input_type instanceof TIterable) {
@ -239,7 +239,10 @@ class ObjectComparator
$input_type_is_interface = $codebase->interfaceExists($intersection_input_type_lower);
$container_type_is_interface = $codebase->interfaceExists($intersection_container_type_lower);
if ($allow_interface_equality && $container_type_is_interface) {
if ($allow_interface_equality
&& $container_type_is_interface
&& ($input_type_is_interface || !isset($intersection_container_types[$intersection_input_key]))
) {
continue 2;
}

15
tests/InterfaceTest.php
View File

@ -686,6 +686,21 @@ class InterfaceTest extends TestCase
$f->m()->m();
}'
],
'dontModifyAfterUnnecessaryAssertion' => [
'<?php
class A {}
interface I {}
/**
* @param A&I $a
* @return A&I
*/
function foo(I $a) {
/** @psalm-suppress RedundantConditionGivenDocblockType */
assert($a instanceof A);
return $a;
}'
],
];
}