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

@@ -10,6 +10,7 @@
 use PHPStan\PhpDocParser\Ast\Type\ObjectShapeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Reflection\ClassMemberAccessAnswerer;
+use PHPStan\Reflection\Dummy\DummyPropertyReflection;
 use PHPStan\Reflection\ExtendedPropertyReflection;
 use PHPStan\Reflection\MissingPropertyFromReflectionException;
 use PHPStan\Reflection\Php\UniversalObjectCratesClassReflectionExtension;
@@ -113,15 +114,14 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 
 	public function hasInstanceProperty(string $propertyName): TrinaryLogic
 	{
-		if (!array_key_exists($propertyName, $this->properties)) {
-			return TrinaryLogic::createNo();
+		if (
+			array_key_exists($propertyName, $this->properties)
+			&& !in_array($propertyName, $this->optionalProperties, true)
+		) {
+			return TrinaryLogic::createYes();
 		}
 
-		if (in_array($propertyName, $this->optionalProperties, true)) {
-			return TrinaryLogic::createMaybe();
-		}
-
-		return TrinaryLogic::createYes();
+		return TrinaryLogic::createMaybe();
 	}
 
 	public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
@@ -131,11 +131,12 @@ public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswe
 
 	public function getUnresolvedInstancePropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
 	{
-		if (!array_key_exists($propertyName, $this->properties)) {
-			throw new ShouldNotHappenException();
+		if (array_key_exists($propertyName, $this->properties)) {
+			$property = new ObjectShapePropertyReflection($propertyName, $this->properties[$propertyName]);
+		} else {
+			$property = new DummyPropertyReflection($propertyName);
 		}
 
-		$property = new ObjectShapePropertyReflection($propertyName, $this->properties[$propertyName]);
 		return new CallbackUnresolvedPropertyPrototypeReflection(
 			$property,
 			$property->getDeclaringClass(),
@@ -297,10 +298,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/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php

@@ -721,13 +721,7 @@ public function testReportAlwaysTrueInLastCondition(bool $reportAlwaysTrueInLast
 	public function testObjectShapes(): void
 	{
 		$this->treatPhpDocTypesAsCertain = true;
-		$this->analyse([__DIR__ . '/data/property-exists-object-shapes.php'], [
-			[
-				'Call to function property_exists() with object{foo: int, bar?: string} and \'baz\' will always evaluate to false.',
-				24,
-				'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
-			],
-		]);
+		$this->analyse([__DIR__ . '/data/property-exists-object-shapes.php'], []);
 	}
 
 	/** @return list<array{0: string, 1: int, 2?: string}> */

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
 	{