Fix ClassConstFetch Identical specification with Yoda conditions

Author: herndlm

phpstan-baseline.neon

@@ -86,7 +86,7 @@ parameters:
 
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
-			count: 2
+			count: 3
 			path: src/Analyser/TypeSpecifier.php
 
 		-

src/Analyser/TypeSpecifier.php

@@ -253,6 +253,7 @@ public function specifyTypesInCondition(
 			}
 
 			if (
+				$context->true() &&
 				$leftExpr instanceof ClassConstFetch &&
 				$leftExpr->class instanceof Expr &&
 				$leftExpr->name instanceof Node\Identifier &&
@@ -270,6 +271,28 @@ public function specifyTypesInCondition(
 					$rootExpr,
 				)->unionWith($this->create($expr->left, $rightType, $context, false, $scope, $rootExpr));
 			}
+
+			$leftType = $scope->getType($leftExpr);
+			if (
+				$context->true() &&
+				$rightExpr instanceof ClassConstFetch &&
+				$rightExpr->class instanceof Expr &&
+				$rightExpr->name instanceof Node\Identifier &&
+				$leftExpr instanceof ClassConstFetch &&
+				$leftType instanceof ConstantStringType &&
+				strtolower($rightExpr->name->toString()) === 'class'
+			) {
+				return $this->specifyTypesInCondition(
+					$scope,
+					new Instanceof_(
+						$rightExpr->class,
+						new Name($leftType->getValue()),
+					),
+					$context,
+					$rootExpr,
+				)->unionWith($this->create($expr->right, $leftType, $context, false, $scope, $rootExpr));
+			}
+
 			if ($context->false()) {
 				$identicalType = $scope->getType($expr);
 				if ($identicalType instanceof ConstantBooleanType) {

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1302,6 +1302,7 @@ public function dataFileAsserts(): iterable
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/gettype.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array_splice.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-9542.php');
 	}
 
 	/**

tests/PHPStan/Analyser/data/bug-5843.php

@@ -15,7 +15,7 @@ function doFoo(object $object): void
 				assertType(\DateTime::class, $object);
 				break;
 			case \Throwable::class:
-				assertType('Throwable~DateTime', $object);
+				assertType('Throwable', $object);
 				break;
 		}
 	}
@@ -29,7 +29,7 @@ function doFoo(object $object): void
 	{
 		match ($object::class) {
 			\DateTime::class => assertType(\DateTime::class, $object),
-			\Throwable::class => assertType('Throwable~DateTime', $object),
+			\Throwable::class => assertType('Throwable', $object),
 		};
 	}
 

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -2911,6 +2911,15 @@ public function testBug8888(): void
 		$this->analyse([__DIR__ . '/data/bug-8888.php'], []);
 	}
 
+	public function testBug9542(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-9542.php'], []);
+	}
+
 	public function testTrickyCallables(): void
 	{
 		$this->checkThisOnly = false;

tests/PHPStan/Rules/Methods/data/bug-9542.php

@@ -0,0 +1,54 @@
+<?php declare(strict_types = 1);
+
+namespace Bug9542;
+
+use function PHPStan\Testing\assertType;
+
+interface TranslatableInterface
+{
+
+}
+
+class TranslatableMessage implements TranslatableInterface
+{
+	public function getMessage(): void
+	{
+		return;
+	}
+}
+
+class HelloWorld
+{
+	public function testInstanceOf(TranslatableInterface $translatable): void
+	{
+		if (! $translatable instanceof TranslatableMessage) {
+			assertType('Bug9542\TranslatableInterface~Bug9542\TranslatableMessage', $translatable);
+			return;
+		}
+
+		assertType('Bug9542\TranslatableMessage', $translatable);
+		$translatable->getMessage();
+	}
+
+	public function testClass(TranslatableInterface $translatable): void
+	{
+		if ($translatable::class !== TranslatableMessage::class) {
+			assertType('Bug9542\TranslatableInterface', $translatable);
+			return;
+		}
+
+		assertType('Bug9542\TranslatableMessage', $translatable);
+		$translatable->getMessage();
+	}
+
+	public function testClassReverse(TranslatableInterface $translatable): void
+	{
+		if (TranslatableMessage::class !== $translatable::class) {
+			assertType('Bug9542\TranslatableInterface', $translatable);
+			return;
+		}
+
+		assertType('Bug9542\TranslatableMessage', $translatable);
+		$translatable->getMessage();
+	}
+}