Retain int specificity when $baseTimestamp is passed in as it appears…

… unable to cause a false return
phpstan · Mar 3, 2022 · ca5e927 · ca5e927
1 parent 1cb8890
commit ca5e927
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Type/Php/StrtotimeFunctionReturnTypeExtension.php b/src/Type/Php/StrtotimeFunctionReturnTypeExtension.php
@@ -10,6 +10,7 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\IntegerRangeType;
+use PHPStan\Type\IntegerType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeUtils;
@@ -31,7 +32,7 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
 	{
 		$defaultReturnType = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
-		if (count($functionCall->getArgs()) !== 1) { // strtotime() & 2nd param baseTimestamp are both unsupported use cases
+		if (count($functionCall->getArgs()) === 0) {
 			return $defaultReturnType;
 		}
 		$argType = $scope->getType($functionCall->getArgs()[0]->value);
@@ -48,10 +49,14 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		if ($results[0] === false) {
 			return new ConstantBooleanType(false);
 		}
+		// 2nd param $baseTimestamp is too non-deterministic so simply return int
+		if (count($functionCall->getArgs()) > 1) {
+			return new IntegerType();
+		}
 
 		$results = array_map('intval', $results);
 
-		return IntegerRangeType::createAllGreaterThan(min($results));
+		return IntegerRangeType::createAllGreaterThan((int) min($results));
 	}
 
 }
diff --git a/tests/PHPStan/Analyser/data/strtotime-return-type-extensions.php b/tests/PHPStan/Analyser/data/strtotime-return-type-extensions.php
@@ -20,7 +20,7 @@
 assertType('int|false', $strtotimeCrash);
 
 $strtotimeWithBase = strtotime('+2 days', time());
-assertType('int|false', $strtotimeWithBase);
+assertType('int', $strtotimeWithBase);
 
 $strtotimePositiveInt = strtotime('1990-01-01 12:00:00 UTC');
 assertType('int<631195201, max>', $strtotimePositiveInt);