Improve filter_var() handling of a couple of simple scalars and null

Author: herndlm

src/Type/Php/FilterFunctionReturnTypeHelper.php

@@ -186,6 +186,10 @@ private function determineExactType(Type $in, int $filterValue, Type $defaultTyp
 			if ($in->isBoolean()->yes()) {
 				return $in;
 			}
+
+			if ($in->isNull()->yes()) {
+				return $defaultType;
+			}
 		}
 
 		if ($filterValue === $this->getConstant('FILTER_VALIDATE_FLOAT')) {
@@ -196,13 +200,29 @@ private function determineExactType(Type $in, int $filterValue, Type $defaultTyp
 			if ($in->isInteger()->yes()) {
 				return $in->toFloat();
 			}
+
+			if ($in->isTrue()->yes()) {
+				return new ConstantFloatType(1);
+			}
+
+			if ($in->isFalse()->yes() || $in->isNull()->yes()) {
+				return $defaultType;
+			}
 		}
 
 		if ($filterValue === $this->getConstant('FILTER_VALIDATE_INT')) {
 			if ($in->isInteger()->yes()) {
 				return $in;
 			}
 
+			if ($in->isTrue()->yes()) {
+				return new ConstantIntegerType(1);
+			}
+
+			if ($in->isFalse()->yes() || $in->isNull()->yes()) {
+				return $defaultType;
+			}
+
 			if ($in instanceof ConstantFloatType) {
 				return $in->getValue() - (int) $in->getValue() <= PHP_FLOAT_EPSILON
 					? $in->toInteger()

tests/PHPStan/Analyser/data/filter-var.php

@@ -81,11 +81,11 @@ public function scalars(bool $bool, float $float, int $int, string $string, int
 		assertType('bool|null', filter_var($nonEmptyString, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE));
 		assertType('bool|null', filter_var('17', FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)); // could be null
 		assertType('bool|null', filter_var('17.1', FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)); // could be null
-		assertType('bool|null', filter_var(null, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)); // could be null
+		assertType('null', filter_var(null, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE));
 
 		assertType('float|false', filter_var($bool, FILTER_VALIDATE_FLOAT));
-		assertType('float|false', filter_var(true, FILTER_VALIDATE_FLOAT)); // could be 1
-		assertType('float|false', filter_var(false, FILTER_VALIDATE_FLOAT)); // could be false
+		assertType('1.0', filter_var(true, FILTER_VALIDATE_FLOAT));
+		assertType('false', filter_var(false, FILTER_VALIDATE_FLOAT));
 		assertType('float', filter_var($float, FILTER_VALIDATE_FLOAT));
 		assertType('17.0', filter_var(17.0, FILTER_VALIDATE_FLOAT));
 		assertType('17.1', filter_var(17.1, FILTER_VALIDATE_FLOAT));
@@ -96,11 +96,11 @@ public function scalars(bool $bool, float $float, int $int, string $string, int
 		assertType('float|false', filter_var($nonEmptyString, FILTER_VALIDATE_FLOAT));
 		assertType('float|false', filter_var('17', FILTER_VALIDATE_FLOAT)); // could be 17.0
 		assertType('float|false', filter_var('17.1', FILTER_VALIDATE_FLOAT)); // could be 17.1
-		assertType('float|false', filter_var(null, FILTER_VALIDATE_FLOAT)); // could be false
+		assertType('false', filter_var(null, FILTER_VALIDATE_FLOAT));
 
 		assertType('int|false', filter_var($bool, FILTER_VALIDATE_INT));
-		assertType('int|false', filter_var(true, FILTER_VALIDATE_INT)); // could be 1
-		assertType('int|false', filter_var(false, FILTER_VALIDATE_INT)); // could be false
+		assertType('1', filter_var(true, FILTER_VALIDATE_INT));
+		assertType('false', filter_var(false, FILTER_VALIDATE_INT));
 		assertType('int|false', filter_var($float, FILTER_VALIDATE_INT));
 		assertType('17', filter_var(17.0, FILTER_VALIDATE_INT));
 		assertType('false', filter_var(17.1, FILTER_VALIDATE_INT));
@@ -111,7 +111,7 @@ public function scalars(bool $bool, float $float, int $int, string $string, int
 		assertType('int|false', filter_var($nonEmptyString, FILTER_VALIDATE_INT));
 		assertType('17', filter_var('17', FILTER_VALIDATE_INT));
 		assertType('false', filter_var('17.1', FILTER_VALIDATE_INT));
-		assertType('int|false', filter_var(null, FILTER_VALIDATE_INT)); // could be false
+		assertType('false', filter_var(null, FILTER_VALIDATE_INT));
 
 		assertType("''|'1'", filter_var($bool));
 		assertType("'1'", filter_var(true));