cover object type

phpstan · Sep 20, 2022 · 696de6f · 696de6f
1 parent c2c29de
commit 696de6f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -1742,7 +1742,10 @@ static function (Type $type, callable $traverse): Type {
 							new AccessoryLiteralStringType(),
 						);
 					} elseif ((new ObjectWithoutClassType())->isSuperTypeOf($type)->yes()) {
-						return new ClassStringType();
+						return TypeCombinator::intersect(
+							new ClassStringType(),
+							new AccessoryLiteralStringType(),
+						);
 					}
 
 					return new ErrorType();

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1035,7 +1035,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Arrays/data/bug-7954.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7993.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7141.php');
-		
+
 		require_once __DIR__ . '/../Rules/Functions/data/bug-7823.php';
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-7823.php');
 	}

diff --git a/tests/PHPStan/Analyser/data/bug-5843.php b/tests/PHPStan/Analyser/data/bug-5843.php
@@ -9,7 +9,7 @@ class Foo
 
 	function doFoo(object $object): void
 	{
-		assertType('class-string', $object::class);
+		assertType('class-string&literal-string', $object::class);
 		switch ($object::class) {
 			case \DateTime::class:
 				assertType(\DateTime::class, $object);

diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
@@ -1167,7 +1167,7 @@ public function testBug7562(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-7562.php'], []);
 	}
-	
+
 	public function testBug7823(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-7823.php'], [

diff --git a/tests/PHPStan/Rules/Functions/data/bug-7823.php b/tests/PHPStan/Rules/Functions/data/bug-7823.php
@@ -45,3 +45,11 @@ function z($t): void
 	sayHello($t::class);
 }
 
+/**
+ * @param object $o
+ */
+function a($o): void
+{
+	assertType('class-string&literal-string', $o::class);
+	sayHello($o::class);
+}