isset() - truthy vs. true

ondrejmirtes · ondrejmirtes · commit fcb78d959771 · 2020-10-22T16:32:38.000+02:00
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -538,9 +538,9 @@ public function specifyTypesInCondition(
 			(
 				$expr instanceof Expr\Isset_
 				&& count($expr->vars) > 0
-				&& $context->truthy()
+				&& $context->true()
 			)
-			|| ($expr instanceof Expr\Empty_ && $context->falsey())
+			|| ($expr instanceof Expr\Empty_ && $context->false())
 		) {
 			$vars = [];
 			if ($expr instanceof Expr\Isset_) {
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -10209,6 +10209,16 @@ public function dataCount(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/count-type.php');
 	}
 
+	public function dataBug2816(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-2816.php');
+	}
+
+	public function dataBug2816Two(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-2816-2.php');
+	}
+
 	public function dataBug3985(): array
 	{
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-3985.php');
@@ -10298,6 +10308,8 @@ public function dataBug3985(): array
 	 * @dataProvider dataBug1924
 	 * @dataProvider dataExtraIntTypes
 	 * @dataProvider dataCount
+	 * @dataProvider dataBug2816
+	 * @dataProvider dataBug2816Two
 	 * @dataProvider dataBug3985
 	 * @param string $assertType
 	 * @param string $file
diff --git a/tests/PHPStan/Analyser/data/bug-2816-2.php b/tests/PHPStan/Analyser/data/bug-2816-2.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Bug2816;
+
+use PHPStan\TrinaryLogic;
+use function PHPStan\Analyser\assertType;
+use function PHPStan\Analyser\assertVariableCertainty;
+
+if (isset($_GET['x'])) {
+	$a = 1;
+}
+
+assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+assertType('mixed', $a);
+
+if (isset($a)) {
+	echo "hello";
+	assertVariableCertainty(TrinaryLogic::createYes(), $a);
+	assertType('mixed~null', $a);
+} else {
+	assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+}
+
+assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+assertType('mixed', $a);
+
+if (isset($a)) {
+	echo "hello2";
+	assertVariableCertainty(TrinaryLogic::createYes(), $a);
+	assertType('mixed~null', $a);
+} else {
+	assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+}
+
+assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+assertType('mixed', $a);
diff --git a/tests/PHPStan/Analyser/data/bug-2816.php b/tests/PHPStan/Analyser/data/bug-2816.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Bug2816;
+
+use PHPStan\TrinaryLogic;
+use function PHPStan\Analyser\assertType;
+use function PHPStan\Analyser\assertVariableCertainty;
+
+if (isset($_GET['x'])) {
+	$a = 1;
+}
+
+assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+assertType('mixed', $a);
+
+if (isset($a) === true) {
+	echo "hello";
+	assertVariableCertainty(TrinaryLogic::createYes(), $a);
+	assertType('mixed~null', $a);
+} else {
+	assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+}
+
+assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+assertType('mixed', $a);
+
+if (isset($a) === true) {
+	echo "hello2";
+	assertVariableCertainty(TrinaryLogic::createYes(), $a);
+	assertType('mixed~null', $a);
+} else {
+	assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+}
+
+assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+assertType('mixed', $a);

Original file line number	Diff line number	Diff line change
`@@ -538,9 +538,9 @@ public function specifyTypesInCondition(`
`538`	`538`	`(`
`539`	`539`	`$expr instanceof Expr\Isset_`
`540`	`540`	`&& count($expr->vars) > 0`
`541`		`- && $context->truthy()`
	`541`	`+ && $context->true()`
`542`	`542`	`)`
`543`		`- \|\| ($expr instanceof Expr\Empty_ && $context->falsey())`
	`543`	`+ \|\| ($expr instanceof Expr\Empty_ && $context->false())`
`544`	`544`	`) {`
`545`	`545`	`$vars = [];`
`546`	`546`	`if ($expr instanceof Expr\Isset_) {`