Fix DateTime::format('u') return type

Author: mvorisek

src/Type/Php/DateFunctionReturnTypeHelper.php

@@ -76,7 +76,7 @@ public function buildReturnTypeFromFormat(string $formatString, bool $useMicrose
 				return $this->buildNumericRangeType(0, 1, false);
 			case 'u':
 				return $useMicrosec
-					? new IntersectionType([new StringType(), new AccessoryNonFalsyStringType()])
+					? new IntersectionType([new StringType(), new AccessoryNumericStringType()])
 					: new ConstantStringType('000000');
 		}
 

tests/PHPStan/Analyser/nsrt/bug-10893.php

@@ -5,16 +5,18 @@
 use function PHPStan\Testing\assertType;
 
 /**
- * @param non-falsy-string $nonfalsy
+ * @param numeric-string $numericString
  */
-function hasMicroseconds(\DateTimeInterface $value, string $nonfalsy): bool
+function hasMicroseconds(\DateTimeInterface $value, string $numericString): bool
 {
-	assertType('non-falsy-string', $value->format('u'));
+	assertType('numeric-string', $value->format('u'));
 	assertType('int', (int)$value->format('u'));
 	assertType('bool', (int)$value->format('u') !== 0);
-	assertType('non-falsy-string', $nonfalsy);
-	assertType('int', (int)$nonfalsy);
-	assertType('bool', (int)$nonfalsy !== 0);
+	assertType('numeric-string', $numericString);
+	assertType('int', (int)$numericString);
+	assertType('bool', (int)$numericString !== 0);
+
+	assertType('float', $value->format('u') * 1e-6);
 
 	return (int) $value->format('u') !== 0;
 }

tests/PHPStan/Analyser/nsrt/bug-6613.php

@@ -6,6 +6,6 @@
 
 function (\DateTime $dt) {
 	assertType("'000000'", date('u'));
-	assertType('non-falsy-string', date_format($dt, 'u'));
-	assertType('non-falsy-string', $dt->format('u'));
+	assertType('numeric-string', date_format($dt, 'u'));
+	assertType('numeric-string', $dt->format('u'));
 };