Fix and tests

Author: VincentLanglet

src/Type/Php/DateTimeModifyReturnTypeExtension.php

@@ -8,10 +8,10 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\NeverType;
-use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use Throwable;
@@ -40,11 +40,12 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
+		$args = $methodCall->getArgs();
 		if (count($methodCall->getArgs()) < 1) {
 			return null;
 		}
 
-		$valueType = $scope->getType($methodCall->getArgs()[0]->value);
+		$valueType = $scope->getType($args[0]->value);
 		$constantStrings = $valueType->getConstantStrings();
 
 		$hasFalse = false;
@@ -78,10 +79,9 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 
 			return null;
 		} elseif ($hasDateTime) {
-			return TypeCombinator::intersect(
-				$scope->getType($methodCall->var),
-				new ObjectType(DateTimeInterface::class),
-			);
+			$variant = ParametersAcceptorSelector::selectFromArgs($scope, $args, $methodReflection->getVariants());
+
+			return TypeCombinator::remove($variant->getReturnType(), new ConstantBooleanType(false));
 		}
 
 		if ($this->phpVersion->hasDateTimeExceptions()) {

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

@@ -14,3 +14,21 @@ public function sayHello(?DateTimeImmutable $date): void
 		assertType('DateTimeImmutable|null', $date?->modify('+1 year')->setTime(23, 59, 59));
 	}
 }
+
+class Foo
+{
+	public function getCode(): bool { return false; }
+}
+
+class HelloWorld2
+{
+	public function sayHello(\Throwable|Foo $foo): void
+	{
+		assertType('bool|int|string', $foo->getCode());
+	}
+
+	public function sayHello2(\LogicException|Foo $foo): void
+	{
+		assertType('bool|int', $foo->getCode());
+	}
+}

tests/PHPStan/Analyser/nsrt/date-format.php

@@ -57,7 +57,15 @@ class Bar {
 	/** @return string */
 	public function modify($string) {}
 }
+class Bar2 {
+	/** @return string|false */
+	public function modify($string) {}
+}
+
+function foo(Foo|Bar $d): void {
+	assertType('DateFormatReturnType\Foo|string', $d->modify('+1 day'));
+};
 
-function (Foo|Bar $d): void {
-	assertType('(DateFormatReturnType\Bar&DateTimeInterface)|DateFormatReturnType\Foo|string', $d->modify('+1 day'));
+function foo2(Foo|Bar2 $d): void {
+	assertType('DateFormatReturnType\Foo|string|false', $d->modify('+1 day'));
 };