Retain int specificity when $baseTimestamp is passed in as it appears unable to cause a false return

Author: Seldaek

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);
@@ -49,9 +50,17 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 return new ConstantBooleanType(false);
 }
 
-$results = array_map('intval', $results);
+// 2nd param $baseTimestamp is too non-deterministic so simply return int
+if (count($functionCall->getArgs()) > 1) {
+return new IntegerType();
+}
+
+// if it is positive we can narrow down to positive-int as long as time flows forward
+if (min(array_map('intval', $results)) > 0) {
+return IntegerRangeType::createAllGreaterThan(0);
+}
 
-return IntegerRangeType::createAllGreaterThan(min($results));
+return new IntegerType();
 }
 
 }

tests/PHPStan/Analyser/data/strtotime-return-type-extensions.php

@@ -4,8 +4,8 @@
 
 use function PHPStan\Testing\assertType;
 
-$strtotimeNow = strtotime('2022-03-03 12:00:00 UTC');
-assertType('int<1646308801, max>', $strtotimeNow);
+$strtotimeNow = strtotime('now');
+assertType('int<1, max>', $strtotimeNow);
 
 $strtotimeInvalid = strtotime('4 qm');
 assertType('false', $strtotimeInvalid);
@@ -20,10 +20,10 @@
 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);
+assertType('int<1, max>', $strtotimePositiveInt);
 
 $strtotimeNegativeInt = strtotime('1969-12-31 12:00:00 UTC');
-assertType('int<-43199, max>', $strtotimeNegativeInt);
+assertType('int', $strtotimeNegativeInt);