More precise constant variants of BooleanType

Author: staabm

src/Type/BooleanType.php

@@ -41,9 +41,19 @@ public function __construct()
 	{
 	}
 
+	public function getConstantScalarTypes(): array
+	{
+		return [new ConstantBooleanType(true), new ConstantBooleanType(false)];
+	}
+
 	public function getConstantStrings(): array
 	{
-		return [];
+		return [new ConstantStringType('1'), new ConstantStringType('0')];
+	}
+
+	public function getConstantScalarValues(): array
+	{
+		return [true, false];
 	}
 
 	public function describe(VerbosityLevel $level): string

src/Type/Php/StrlenFunctionReturnTypeExtension.php

@@ -5,8 +5,6 @@
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Type\BooleanType;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
@@ -44,16 +42,7 @@ public function getTypeFromFunctionCall(
 		}
 
 		$argType = $scope->getType($args[0]->value);
-
-		if ($argType->isSuperTypeOf(new BooleanType())->yes()) {
-			$constantScalars = TypeCombinator::remove($argType, new BooleanType())->getConstantScalarTypes();
-			if (count($constantScalars) > 0) {
-				$constantScalars[] = new ConstantBooleanType(true);
-				$constantScalars[] = new ConstantBooleanType(false);
-			}
-		} else {
-			$constantScalars = $argType->getConstantScalarTypes();
-		}
+		$constantScalars = $argType->getConstantScalarTypes();
 
 		$lengths = [];
 		foreach ($constantScalars as $constantScalar) {

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

@@ -53,4 +53,4 @@ function returnsBool(): bool {
 assertType("'                   1'", $s);
 
 $s = sprintf('%20s', returnsBool());
-assertType("lowercase-string&non-falsy-string", $s);
+assertType("'                    '|'                   1'", $s);