Fix $var ?? null

phpstan · Nov 29, 2023 · c2ba341 · c2ba341
1 parent 093bbb2
commit c2ba341
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -763,7 +763,7 @@ public function specifyTypesInCondition(
 				);
 			}
 
-			if ((new ConstantBooleanType(false))->isSuperTypeOf($scope->getType($expr->right))->yes()) {
+			if ((new ConstantBooleanType(false))->isSuperTypeOf($scope->getType($expr->right)->toBoolean())->yes()) {
 				return $this->create(
 					$expr->left,
 					new NullType(),

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -415,6 +415,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-987.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3677.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4215.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10224.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4695.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2977.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3190.php');

diff --git a/tests/PHPStan/Analyser/data/bug-10224.php b/tests/PHPStan/Analyser/data/bug-10224.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Bug10224;
+
+use PHPStan\TrinaryLogic;
+use function PHPStan\Testing\assertType;
+use function PHPStan\Testing\assertVariableCertainty;
+
+function foo(bool $condition): ?string
+{
+	if ($condition) {
+		$foo = 'bar';
+	}
+	if ($foo ?? null) {
+		assertVariableCertainty(TrinaryLogic::createYes(), $foo);
+		return $foo;
+	}
+	return null;
+}
+
+function bar(bool $condition, $a): ?string
+{
+	if ($condition) {
+		$foo = $a;
+	}
+	if ($foo ?? null) {
+		assertVariableCertainty(TrinaryLogic::createYes(), $foo);
+		assertType("mixed~null", $foo);
+		return $foo;
+	}
+	return null;
+}