Fix wrong signature for DateInterval::createFromDateString in 8.3+

resources/functionMap_php83delta.php

@@ -23,6 +23,7 @@
 	'new' => [
 		'DateTime::modify' => ['static', 'modify'=>'string'],
 		'DateTimeImmutable::modify' => ['static', 'modify'=>'string'],
+		'DateInterval::createFromDateString' => ['DateInterval', 'time'=>'string'],
 		'str_decrement' => ['non-empty-string', 'string'=>'non-empty-string'],
 		'str_increment' => ['non-falsy-string', 'string'=>'non-empty-string'],
 		'gc_status' => ['array{running:bool,protected:bool,full:bool,runs:int,collected:int,threshold:int,buffer_size:int,roots:int,application_time:float,collector_time:float,destructor_time:float,free_time:float}'],

src/Type/Php/DateIntervalCreateFromDateStringMethodThrowTypeExtension.php

@@ -0,0 +1,60 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Php;
+
+use DateInterval;
+use PhpParser\Node\Expr\StaticCall;
+use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Php\PhpVersion;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Type\DynamicStaticMethodThrowTypeExtension;
+use PHPStan\Type\NeverType;
+use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
+use function count;
+
+#[AutowiredService]
+final class DateIntervalCreateFromDateStringMethodThrowTypeExtension implements DynamicStaticMethodThrowTypeExtension
+{
+
+	public function __construct(private PhpVersion $phpVersion)
+	{
+	}
+
+	public function isStaticMethodSupported(MethodReflection $methodReflection): bool
+	{
+		return $methodReflection->getName() === 'createFromDateString' && $methodReflection->getDeclaringClass()->getName() === DateInterval::class;
+	}
+
+	public function getThrowTypeFromStaticMethodCall(MethodReflection $methodReflection, StaticCall $methodCall, Scope $scope): ?Type
+	{
+		if (count($methodCall->getArgs()) === 0) {
+			return null;
+		}
+
+		if (!$this->phpVersion->hasDateTimeExceptions()) {
+			return null;
+		}
+
+		$valueType = $scope->getType($methodCall->getArgs()[0]->value);
+		$constantStrings = $valueType->getConstantStrings();
+
+		foreach ($constantStrings as $constantString) {
+			try {
+				DateInterval::createFromDateString($constantString->getValue());
+			} catch (\Exception) { // phpcs:ignore
+				return $methodReflection->getThrowType();
+			}
+
+			$valueType = TypeCombinator::remove($valueType, $constantString);
+		}
+
+		if (!$valueType instanceof NeverType) {
+			return $methodReflection->getThrowType();
+		}
+
+		return null;
+	}
+
+}

src/Type/Php/DateIntervalDynamicReturnTypeExtension.php

@@ -6,9 +6,11 @@
 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;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Throwable;
@@ -20,6 +22,10 @@
 implements DynamicStaticMethodReturnTypeExtension
 {
 
+	public function __construct(private PhpVersion $phpVersion)
+	{
+	}
+
 	public function getClass(): string
 	{
 		return DateInterval::class;
@@ -48,7 +54,7 @@
 				$possibleReturnTypes[] = false;
 				continue;
 			}
 			$possibleReturnTypes[] = $result instanceof DateInterval ? DateInterval::class : false;
 		}
 
 		// the error case, when wrong types are passed
@@ -61,6 +67,9 @@
 		}
 
 		if (in_array(false, $possibleReturnTypes, true)) {
+			if ($this->phpVersion->hasDateTimeExceptions()) {
+				return new NeverType();
+			}
 			return new ConstantBooleanType(false);
 		}
 

tests/PHPStan/Analyser/nsrt/bug-14479-83.php

@@ -0,0 +1,13 @@
+<?php // lint >= 8.3
+
+namespace Bug14479Php83;
+
+use function PHPStan\Testing\assertType;
+
+function test(string $input) {
+	assertType(\DateInterval::class, \DateInterval::createFromDateString($input));
+}
+
+function test2() {
+	assertType('*NEVER*', \DateInterval::createFromDateString('foo'));
+}

tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php

@@ -141,6 +141,10 @@ public function testRule(): void
 				'Dead catch - ArithmeticError is never thrown in the try block.',
 				762,
 			],
+			[
+				'Dead catch - DateMalformedIntervalStringException is never thrown in the try block.',
+				800,
+			],
 		]);
 	}
 
@@ -233,6 +237,10 @@ public function testRuleWithoutReportingUncheckedException(): void
 				'Dead catch - Exception is never thrown in the try block.',
 				555,
 			],
+			[
+				'Dead catch - DateMalformedIntervalStringException is never thrown in the try block.',
+				800,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Exceptions/data/unthrown-exception.php

@@ -790,3 +790,24 @@ public function doFoo(int $int, int $negativeInt, int $positiveInt): void
 	}
 
 }
+
+class TestDateIntervalCreateFromDateString
+{
+	public function doFoo(): void
+	{
+		try {
+			\DateInterval::createFromDateString('P10D');
+		} catch (\DateMalformedIntervalStringException $e) {
+
+		}
+	}
+
+	public function doBar(): void
+	{
+		try {
+			\DateInterval::createFromDateString('invalid');
+		} catch (\DateMalformedIntervalStringException $e) {
+
+		}
+	}
+}