Try

Author: VincentLanglet

phpstan-baseline.neon

@@ -1464,7 +1464,7 @@ parameters:
 		-
 			rawMessage: 'Doing instanceof PHPStan\Type\ObjectShapeType is error-prone and deprecated. Use Type::isObject() and Type::hasProperty() instead.'
 			identifier: phpstanApi.instanceofType
-			count: 3
+			count: 2
 			path: src/Type/ObjectShapeType.php
 
 		-

src/Type/ObjectShapeType.php

@@ -113,15 +113,14 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 
 	public function hasInstanceProperty(string $propertyName): TrinaryLogic
 	{
-		if (!array_key_exists($propertyName, $this->properties)) {
-			return TrinaryLogic::createNo();
-		}
-
-		if (in_array($propertyName, $this->optionalProperties, true)) {
-			return TrinaryLogic::createMaybe();
+		if (
+			array_key_exists($propertyName, $this->properties)
+			&& !in_array($propertyName, $this->optionalProperties, true)
+		) {
+			return TrinaryLogic::createYes();
 		}
 
-		return TrinaryLogic::createYes();
+		return TrinaryLogic::createMaybe();
 	}
 
 	public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
@@ -297,10 +296,6 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 		foreach ($this->properties as $propertyName => $propertyType) {
 			$hasProperty = new IsSuperTypeOfResult($type->hasInstanceProperty((string) $propertyName), []);
 			if ($hasProperty->no()) {
-				if ($type instanceof self) {
-					$result = $result->and(IsSuperTypeOfResult::createMaybe());
-					continue;
-				}
 				if (in_array($propertyName, $this->optionalProperties, true)) {
 					continue;
 				}

tests/PHPStan/Type/ObjectShapeTypeTest.php

@@ -145,9 +145,6 @@ public static function dataIsSuperTypeOf(): iterable
 		];
 	}
 
-	/**
-	 * @param TrinaryLogic $expectedResult
-	 */
 	#[DataProvider('dataIsSuperTypeOf')]
 	public function testIsSuperTypeOf(ObjectShapeType $type, Type $otherType, TrinaryLogic $expectedResult): void
 	{