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

Process reconciliation more aptly

Browse Source
This commit is contained in:
Brown 2019-10-08 14:33:06 -04:00
parent 6b012f8fa6
commit 5265aee278
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Internal/Type/NegatedAssertionReconciler.php
View File

@ -273,6 +273,14 @@ class NegatedAssertionReconciler extends Reconciler
false
)) {
$existing_var_type->removeType($part_name);
} elseif (TypeAnalyzer::isAtomicContainedBy(
$codebase,
$new_type_part,
$existing_var_type_part,
false,
false
)) {
$existing_var_type->different = true;
}
}
}

23
tests/TypeReconciliationTest.php
View File

@ -1474,6 +1474,29 @@ class TypeReconciliationTest extends TestCase
takes_int($int);
}'
],
'removeAllObjects' => [
'<?php
class A {}
class B extends A {
public function foo() : void {}
}
class BChild extends B {}
class C extends A {}
class D extends A {}
/** @param B|C|D $a */
function foo(A $a) : B {
if ($a instanceof C) {
$a = new B();
} elseif ($a instanceof D) {
$a = new B();
} elseif (!$a instanceof BChild) {
// do something
}
return $a;
}'
],
];
}