Commit 7c0c857

rvanvelzenondrejmirtes

authored and

committed

Fix specifying types on nullsafe true/false comparison

1 parent 50ef61e commit 7c0c857Copy full SHA for 7c0c857

File tree

+67

-2

lines changed

+67

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1134,7 +1134,7 @@ private function specifyTypesForConstantBinaryExpression(`
`1134`	`1134`	`{`
`1135`	`1135`	`if (!$context->null() && $constantType->isFalse()->yes()) {`
`1136`	`1136`	`$types = $this->create($exprNode, $constantType, $context, false, $scope, $rootExpr);`
`1137`		`- if ($exprNode instanceof Expr\NullsafeMethodCall \|\| $exprNode instanceof Expr\NullsafePropertyFetch) {`
	`1137`	`+ if (!$context->true() && ($exprNode instanceof Expr\NullsafeMethodCall \|\| $exprNode instanceof Expr\NullsafePropertyFetch)) {`
`1138`	`1138`	`return $types;`
`1139`	`1139`	`}`
`1140`	`1140`
`@@ -1148,7 +1148,7 @@ private function specifyTypesForConstantBinaryExpression(`
`1148`	`1148`
`1149`	`1149`	`if (!$context->null() && $constantType->isTrue()->yes()) {`
`1150`	`1150`	`$types = $this->create($exprNode, $constantType, $context, false, $scope, $rootExpr);`
`1151`		`- if ($exprNode instanceof Expr\NullsafeMethodCall \|\| $exprNode instanceof Expr\NullsafePropertyFetch) {`
	`1151`	`+ if (!$context->true() && ($exprNode instanceof Expr\NullsafeMethodCall \|\| $exprNode instanceof Expr\NullsafePropertyFetch)) {`
`1152`	`1152`	`return $types;`
`1153`	`1153`	`}`
`1154`	`1154`

Lines changed: 65 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,65 @@`
	`1`	`+<?php declare(strict_types = 1); // lint >= 8.0`
	`2`	`+`
	`3`	`+namespace Bug12866;`
	`4`	`+`
	`5`	`+use function PHPStan\Testing\assertType;`
	`6`	`+`
	`7`	`+interface I`
	`8`	`+{`
	`9`	`+ /**`
	`10`	`+ * @phpstan-assert-if-true A $this`
	`11`	`+ */`
	`12`	`+ public function isA(): bool;`
	`13`	`+}`
	`14`	`+`
	`15`	`+class A implements I`
	`16`	`+{`
	`17`	`+ public function isA(): bool`
	`18`	`+ {`
	`19`	`+ return true;`
	`20`	`+ }`
	`21`	`+}`
	`22`	`+`
	`23`	`+class B implements I`
	`24`	`+{`
	`25`	`+ public function isA(): bool`
	`26`	`+ {`
	`27`	`+ return false;`
	`28`	`+ }`
	`29`	`+}`
	`30`	`+`
	`31`	`+function takesI(I $i): void`
	`32`	`+{`
	`33`	`+ if (!$i->isA()) {`
	`34`	`+ return;`
	`35`	`+ }`
	`36`	`+`
	`37`	`+ assertType('Bug12866\\A', $i);`
	`38`	`+}`
	`39`	`+`
	`40`	`+function takesIStrictComparison(I $i): void`
	`41`	`+{`
	`42`	`+ if ($i->isA() !== true) {`
	`43`	`+ return;`
	`44`	`+ }`
	`45`	`+`
	`46`	`+ assertType('Bug12866\\A', $i);`
	`47`	`+}`
	`48`	`+`
	`49`	`+function takesNullableI(?I $i): void`
	`50`	`+{`
	`51`	`+ if (!$i?->isA()) {`
	`52`	`+ return;`
	`53`	`+ }`
	`54`	`+`
	`55`	`+ assertType('Bug12866\\A', $i);`
	`56`	`+}`
	`57`	`+`
	`58`	`+function takesNullableIStrictComparison(?I $i): void`
	`59`	`+{`
	`60`	`+ if ($i?->isA() !== true) {`
	`61`	`+ return;`
	`62`	`+ }`
	`63`	`+`
	`64`	`+ assertType('Bug12866\\A', $i);`
	`65`	`+}`

Comments

(0)