Skip to content

Commit d8be8dd

Browse files
committed
Merge branch 2.1.x into 2.2.x
2 parents 1ecb9f4 + 70d1e1c commit d8be8dd

File tree

3 files changed

+0
-169
lines changed

3 files changed

+0
-169
lines changed

src/Analyser/ExprHandler/AssignHandler.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,6 @@ private function processSureTypesForConditionalExpressionsAfterAssign(Scope $sco
865865
!$expr instanceof PropertyFetch
866866
&& !$expr instanceof ArrayDimFetch
867867
&& !$expr instanceof FuncCall
868-
&& !$expr instanceof MethodCall
869-
&& !$expr instanceof Expr\StaticCall
870868
) {
871869
continue;
872870
}
@@ -906,8 +904,6 @@ private function processSureNotTypesForConditionalExpressionsAfterAssign(Scope $
906904
!$expr instanceof PropertyFetch
907905
&& !$expr instanceof ArrayDimFetch
908906
&& !$expr instanceof FuncCall
909-
&& !$expr instanceof MethodCall
910-
&& !$expr instanceof Expr\StaticCall
911907
) {
912908
continue;
913909
}

tests/PHPStan/Analyser/nsrt/bug-5207.php

Lines changed: 0 additions & 81 deletions
This file was deleted.

tests/PHPStan/Analyser/nsrt/bug-9455.php

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)