Fix NeverType::toBoolean()

phpstan · Feb 1, 2022 · fe3a341 · fe3a341
1 parent 1ec1c91
commit fe3a341
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -12,15 +12,15 @@
 use PHPStan\Reflection\Type\UnresolvedPropertyPrototypeReflection;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\Traits\FalseyBooleanTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
+use PHPStan\Type\Traits\UndecidedBooleanTypeTrait;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
 
 /** @api */
 class NeverType implements CompoundType
 {
 
-	use FalseyBooleanTypeTrait;
+	use UndecidedBooleanTypeTrait;
 	use NonGenericTypeTrait;
 	use UndecidedComparisonCompoundTypeTrait;
 

diff --git a/tests/PHPStan/Rules/Comparison/BooleanAndConstantConditionRuleTest.php b/tests/PHPStan/Rules/Comparison/BooleanAndConstantConditionRuleTest.php
@@ -56,7 +56,7 @@ public function testRule(): void
 				27,
 			],
 			[
-				'Right side of && is always false.',
+				'Result of && is always false.',
 				30,
 			],
 			[

diff --git a/tests/PHPStan/Rules/Comparison/BooleanOrConstantConditionRuleTest.php b/tests/PHPStan/Rules/Comparison/BooleanOrConstantConditionRuleTest.php
@@ -60,7 +60,7 @@ public function testRule(): void
 				30,
 			],
 			[
-				'Right side of || is always false.',
+				'Result of || is always true.',
 				33,
 			],
 			[
@@ -175,4 +175,10 @@ public function testTreatPhpDocTypesAsCertainRegression(bool $treatPhpDocTypesAs
 		$this->analyse([__DIR__ . '/data/boolean-or-treat-phpdoc-types-regression.php'], []);
 	}
 
+	public function testBug6258(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-6258.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-6258.php b/tests/PHPStan/Rules/Comparison/data/bug-6258.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Bug6258;
+
+defined('a') || die();
+defined('a') or die();
+rand() === rand() || die();
+
+
+defined('a') || exit();
+defined('a') or exit();
+rand() === rand() || exit();
+
+
+defined('a') || throw new \Exception('');
+defined('a') or  throw new \Exception('');
+rand() === rand() ||  throw new \Exception('');
diff --git a/tests/PHPStan/Type/IntersectionTypeTest.php b/tests/PHPStan/Type/IntersectionTypeTest.php
@@ -396,7 +396,7 @@ public function testIsSubTypeOfInversed(IntersectionType $type, Type $otherType,
 	public function testToBooleanCrash(): void
 	{
 		$type = new IntersectionType([new NeverType(), new NonEmptyArrayType()]);
-		$this->assertSame('bool', $type->toBoolean()->describe(VerbosityLevel::precise()));
+		$this->assertSame('true', $type->toBoolean()->describe(VerbosityLevel::precise()));
 	}
 
 }