Simplify ConstantBool handling (#524)

* Simplify ConstantBool handling

* cs

* Update RequestDynamicReturnTypeExtension.php

Author: staabm

src/Type/Symfony/Form/FormInterfaceDynamicReturnTypeExtension.php

@@ -5,7 +5,6 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\ObjectType;
@@ -41,10 +40,10 @@ public function getTypeFromMethodCall(
 		$firstArgType = $scope->getType($methodCall->getArgs()[0]->value);
 		$secondArgType = $scope->getType($methodCall->getArgs()[1]->value);
 
-		$firstIsTrueType = (new ConstantBooleanType(true))->isSuperTypeOf($firstArgType)->result;
-		$firstIsFalseType = (new ConstantBooleanType(false))->isSuperTypeOf($firstArgType)->result;
-		$secondIsTrueType = (new ConstantBooleanType(true))->isSuperTypeOf($secondArgType)->result;
-		$secondIsFalseType = (new ConstantBooleanType(false))->isSuperTypeOf($secondArgType)->result;
+		$firstIsTrueType = $firstArgType->isTrue();
+		$firstIsFalseType = $firstArgType->isFalse();
+		$secondIsTrueType = $secondArgType->isTrue();
+		$secondIsFalseType = $secondArgType->isFalse();
 
 		$firstCompareType = $firstIsTrueType->compareTo($firstIsFalseType);
 		$secondCompareType = $secondIsTrueType->compareTo($secondIsFalseType);

src/Type/Symfony/HeaderBagDynamicReturnTypeExtension.php

@@ -34,8 +34,8 @@ public function getTypeFromMethodCall(
 	): ?Type
 	{
 		$firstArgType = isset($methodCall->getArgs()[2]) ? $scope->getType($methodCall->getArgs()[2]->value) : new ConstantBooleanType(true);
-		$isTrueType = (new ConstantBooleanType(true))->isSuperTypeOf($firstArgType)->result;
-		$isFalseType = (new ConstantBooleanType(false))->isSuperTypeOf($firstArgType)->result;
+		$isTrueType = $firstArgType->isTrue();
+		$isFalseType = $firstArgType->isFalse();
 		$compareTypes = $isTrueType->compareTo($isFalseType);
 
 		if ($compareTypes === $isTrueType) {

src/Type/Symfony/KernelInterfaceDynamicReturnTypeExtension.php

@@ -32,8 +32,8 @@ public function getTypeFromMethodCall(
 	): ?Type
 	{
 		$firstArgType = isset($methodCall->getArgs()[2]) ? $scope->getType($methodCall->getArgs()[2]->value) : new ConstantBooleanType(true);
-		$isTrueType = (new ConstantBooleanType(true))->isSuperTypeOf($firstArgType)->result;
-		$isFalseType = (new ConstantBooleanType(false))->isSuperTypeOf($firstArgType)->result;
+		$isTrueType = $firstArgType->isTrue();
+		$isFalseType = $firstArgType->isFalse();
 		$compareTypes = $isTrueType->compareTo($isFalseType);
 
 		if ($compareTypes === $isTrueType) {

src/Type/Symfony/RequestDynamicReturnTypeExtension.php

@@ -5,7 +5,6 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\ResourceType;
 use PHPStan\Type\StringType;
@@ -35,8 +34,8 @@ public function getTypeFromMethodCall(
 		}
 
 		$argType = $scope->getType($methodCall->getArgs()[0]->value);
-		$isTrueType = (new ConstantBooleanType(true))->isSuperTypeOf($argType)->result;
-		$isFalseType = (new ConstantBooleanType(false))->isSuperTypeOf($argType)->result;
+		$isTrueType = $argType->isTrue();
+		$isFalseType = $argType->isFalse();
 		$compareTypes = $isTrueType->compareTo($isFalseType);
 		if ($compareTypes === $isTrueType) {
 			return new ResourceType();