Update DateIntervalDynamicReturnTypeExtension to handle 8.3 exceptions

Author: sunkan

src/Type/Php/DateIntervalDynamicReturnTypeExtension.php

@@ -6,6 +6,7 @@
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
@@ -20,6 +21,10 @@ final class DateIntervalDynamicReturnTypeExtension
 implements DynamicStaticMethodReturnTypeExtension
 {
 
+	public function __construct(private PhpVersion $phpVersion)
+	{
+	}
+
 	public function getClass(): string
 	{
 		return DateInterval::class;
@@ -45,6 +50,9 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 			try {
 				$result = @DateInterval::createFromDateString($string->getValue());
 			} catch (Throwable) {
+				if ($this->phpVersion->hasDateTimeExceptions()) {
+					return new ObjectType('DateMalformedIntervalStringException');
+				}
 				$possibleReturnTypes[] = false;
 				continue;
 			}

tests/PHPStan/Rules/Exceptions/MissingCheckedExceptionInMethodThrowsRuleTest.php

@@ -66,6 +66,10 @@ public function testRule(): void
 				'Method MissingExceptionMethodThrows\Foo::dateTimeModifyDoesThrows() throws checked exception DateMalformedStringException but it\'s missing from the PHPDoc @throws tag.',
 				122,
 			];
+			$errors[] = [
+				'Method MissingExceptionMethodThrows\Foo::dateIntervalFromStringDoesThrows() throws checked exception DateMalformedIntervalStringException but it\'s missing from the PHPDoc @throws tag.',
+				127,
+			];
 		}
 		$this->analyse([__DIR__ . '/data/missing-exception-method-throws.php'], $errors);
 	}

tests/PHPStan/Rules/Exceptions/data/missing-exception-method-throws.php

@@ -122,4 +122,14 @@ public function dateTimeModifyDoesThrows(\DateTime $dt, \DateTimeImmutable $dti,
 		$dti->modify($m);
 	}
 
+	public function dateIntervalFromStringDoesThrows(string $i): void
+	{
+		\DateInterval::createFromDateString($i);
+	}
+
+	public function dateIntervalFromStringDoeNotThrow(): void
+	{
+		\DateInterval::createFromDateString('1 day');
+	}
+
 }