Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

phpstan · Jan 5, 2025 · a2d5bb1 · a2d5bb1
2 parents 82a6961 + fd7bad3
commit a2d5bb1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1455,12 +1455,6 @@ parameters:
 			count: 1
 			path: src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Type/Php/ArrayFilterFunctionReturnTypeHelper.php
-
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantStringType is error\-prone and deprecated\. Use Type\:\:getConstantStrings\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
@@ -1473,12 +1467,6 @@ parameters:
 			count: 4
 			path: src/Type/Php/ArrayMergeFunctionDynamicReturnTypeExtension.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Type/Php/ArraySearchFunctionDynamicReturnTypeExtension.php
-
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\ConstantScalarType is error\-prone and deprecated\. Use Type\:\:isConstantScalarValue\(\) or Type\:\:getConstantScalarTypes\(\) or Type\:\:getConstantScalarValues\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType

diff --git a/src/Type/Php/ArrayFilterFunctionReturnTypeHelper.php b/src/Type/Php/ArrayFilterFunctionReturnTypeHelper.php
@@ -22,7 +22,6 @@
 use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\MixedType;
@@ -256,7 +255,7 @@ private function processKeyAndItemType(MutatingScope $scope, Type $keyType, Type
 		return [
 			$keyVarName !== null ? $scope->getVariableType($keyVarName) : $keyType,
 			$itemVarName !== null ? $scope->getVariableType($itemVarName) : $itemType,
-			!$booleanResult instanceof ConstantBooleanType,
+			!$booleanResult->isTrue()->yes(),
 		];
 	}
 

diff --git a/src/Type/Php/ArraySearchFunctionDynamicReturnTypeExtension.php b/src/Type/Php/ArraySearchFunctionDynamicReturnTypeExtension.php
@@ -43,7 +43,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		}
 
 		$strictArgType = $scope->getType($functionCall->getArgs()[2]->value);
-		if (!$strictArgType instanceof ConstantBooleanType || $strictArgType->getValue() === false) {
+		if (!$strictArgType->isTrue()->yes()) {
 			return TypeCombinator::union($haystackArgType->getIterableKeyType(), new ConstantBooleanType(false));
 		}