DateTime|DateTimeInterface union accepts DateTimeInterface

phpstan · Jul 30, 2021 · f3d449f · f3d449f
1 parent 419bc0d
commit f3d449f
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 3 deletions.
diff --git a/src/Rules/RuleLevelHelper.php b/src/Rules/RuleLevelHelper.php
@@ -75,7 +75,8 @@ public function accepts(Type $acceptingType, Type $acceptedType, bool $strictTyp
 			$acceptedType = TypeCombinator::removeNull($acceptedType);
 		}
 
-		if ($acceptingType instanceof UnionType && !$acceptedType instanceof CompoundType) {
+		$accepts = $acceptingType->accepts($acceptedType, $strictTypes);
+		if (!$accepts->yes() && $acceptingType instanceof UnionType && !$acceptedType instanceof CompoundType) {
 			foreach ($acceptingType->getTypes() as $innerType) {
 				if (self::accepts($innerType, $acceptedType, $strictTypes)) {
 					return true;
@@ -103,8 +104,6 @@ public function accepts(Type $acceptingType, Type $acceptedType, bool $strictTyp
 			);
 		}
 
-		$accepts = $acceptingType->accepts($acceptedType, $strictTypes);
-
 		return $this->checkUnionTypes ? $accepts->yes() : !$accepts->no();
 	}
 

diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -70,6 +70,16 @@ public function getReferencedClasses(): array
 
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
+		if (
+			$type->equals(new ObjectType(\DateTimeInterface::class))
+			&& $this->accepts(
+				new UnionType([new ObjectType(\DateTime::class), new ObjectType(\DateTimeImmutable::class)]),
+				$strictTypes
+			)->yes()
+		) {
+			return TrinaryLogic::createYes();
+		}
+
 		if ($type instanceof CompoundType && !$type instanceof CallableType) {
 			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
 		}

diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -493,6 +493,10 @@ public function testCallMethods(): void
 				'Parameter #1 $test of method Test\NumericStringParam::sayHello() expects string&numeric, \'abc\' given.',
 				1658,
 			],
+			[
+				'Parameter #1 $date of method Test\HelloWorld3::sayHello() expects array<DateTime|DateTimeImmutable>|int, DateTimeInterface given.',
+				1732,
+			],
 		]);
 	}
 
@@ -767,6 +771,10 @@ public function testCallMethodsOnThisOnly(): void
 				'Parameter #1 $test of method Test\NumericStringParam::sayHello() expects string&numeric, \'abc\' given.',
 				1658,
 			],
+			[
+				'Parameter #1 $date of method Test\HelloWorld3::sayHello() expects array<DateTime|DateTimeImmutable>|int, DateTimeInterface given.',
+				1732,
+			],
 		]);
 	}
 

diff --git a/tests/PHPStan/Rules/Methods/data/call-methods.php b/tests/PHPStan/Rules/Methods/data/call-methods.php
@@ -1678,3 +1678,57 @@ public function openStatically(): void
 	}
 
 }
+
+class HelloWorld
+{
+	/**
+	 * @param \DateTime|\DateTimeImmutable|int $date
+	 */
+	public function sayHello($date): void
+	{
+	}
+
+	/**
+	 * @param \DateTimeInterface|int $d
+	 */
+	public function foo($d): void
+	{
+		$this->sayHello($d);
+	}
+}
+
+class HelloWorld2
+{
+	/**
+	 * @param \DateTime|\DateTimeImmutable $date
+	 */
+	public function sayHello($date): void
+	{
+	}
+
+	/**
+	 * @param \DateTimeInterface $d
+	 */
+	public function foo($d): void
+	{
+		$this->sayHello($d);
+	}
+}
+
+class HelloWorld3
+{
+	/**
+	 * @param array<\DateTime|\DateTimeImmutable>|int $date
+	 */
+	public function sayHello($date): void
+	{
+	}
+
+	/**
+	 * @param \DateTimeInterface $d
+	 */
+	public function foo($d): void
+	{
+		$this->sayHello($d);
+	}
+}