ObjectShapeType - do not access Type::getProperty() before making sure Type::hasProperty() is yes

Author: ondrejmirtes

src/Type/ObjectShapeType.php

@@ -159,29 +159,21 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult
 				if (in_array($propertyName, $this->optionalProperties, true)) {
 					continue;
 				}
-				return $hasProperty;
+				$result = $result->and($hasProperty);
+				continue;
 			}
-			if ($hasProperty->maybe() && in_array($propertyName, $this->optionalProperties, true)) {
+			if ($hasProperty->maybe()) {
+				if (!in_array($propertyName, $this->optionalProperties, true)) {
+					$result = $result->and($hasProperty);
+					continue;
+
+				}
+
 				$hasProperty = AcceptsResult::createYes();
 			}
 
 			$result = $result->and($hasProperty);
-
-			try {
-				$otherProperty = $type->getProperty($propertyName, $scope);
-			} catch (MissingPropertyFromReflectionException) {
-				return new AcceptsResult(
-					$result->result,
-					[
-						sprintf(
-							'%s %s not have property $%s.',
-							$type->describe(VerbosityLevel::typeOnly()),
-							$result->no() ? 'does' : 'might',
-							$propertyName,
-						),
-					],
-				);
-			}
+			$otherProperty = $type->getProperty($propertyName, $scope);
 			if (!$otherProperty->isPublic()) {
 				return new AcceptsResult(TrinaryLogic::createNo(), [
 					sprintf('Property %s::$%s is not public.', $otherProperty->getDeclaringClass()->getDisplayName(), $propertyName),
@@ -260,20 +252,20 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 				if (in_array($propertyName, $this->optionalProperties, true)) {
 					continue;
 				}
-				return $hasProperty;
+				$result = $result->and($hasProperty);
+				continue;
 			}
-			if ($hasProperty->maybe() && in_array($propertyName, $this->optionalProperties, true)) {
+			if ($hasProperty->maybe()) {
+				if (!in_array($propertyName, $this->optionalProperties, true)) {
+					$result = $result->and($hasProperty);
+					continue;
+				}
+
 				$hasProperty = IsSuperTypeOfResult::createYes();
 			}
 
 			$result = $result->and($hasProperty);
-
-			try {
-				$otherProperty = $type->getProperty($propertyName, $scope);
-			} catch (MissingPropertyFromReflectionException) {
-				return $result;
-			}
-
+			$otherProperty = $type->getProperty($propertyName, $scope);
 			if (!$otherProperty->isPublic()) {
 				return IsSuperTypeOfResult::createNo();
 			}

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -201,6 +201,14 @@ public function testBug2823(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug13424(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-13424.php');
+		$this->assertCount(1, $errors);
+		$this->assertSame('Instantiated class Bug13424\Hello not found.', $errors[0]->getMessage());
+		$this->assertSame(14, $errors[0]->getLine());
+	}
+
 	public function testTwoSameClassesInSingleFile(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/two-same-classes.php');

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

@@ -0,0 +1,17 @@
+<?php
+
+namespace Bug13424;
+
+final class DemoFile
+{
+	/** @param mixed[] $args */
+	public function run( $args ): void {
+		if ( ! empty( $args['bar'] ) ) {
+			$hello = (object) array(
+				'a' => 'b',
+			);
+		} else {
+			$hello = new Hello( $args );
+		}
+	}
+}

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -3000,12 +3000,12 @@ public function testObjectShapes(): void
 			[
 				'Parameter #1 $o of method ObjectShapesAcceptance\Foo::doBar() expects object{foo: int, bar: string}, Exception given.',
 				14,
-				PHP_VERSION_ID >= 80200 ? 'Exception does not have property $foo.' : 'Exception might not have property $foo.',
+				PHP_VERSION_ID >= 80200 ? "• Exception does not have property \$foo.\n• Exception does not have property \$bar." : "• Exception might not have property \$foo.\n• Exception might not have property \$bar.",
 			],
 			[
 				'Parameter #1 $o of method ObjectShapesAcceptance\Foo::doBar() expects object{foo: int, bar: string}, Exception given.',
 				15,
-				'Exception might not have property $foo.',
+				"• Exception might not have property \$foo.\n• Exception might not have property \$bar.",
 			],
 			[
 				'Parameter #1 $o of method ObjectShapesAcceptance\Foo::doBar() expects object{foo: int, bar: string}, object{foo: string, bar: int} given.',
@@ -3073,7 +3073,7 @@ public function testObjectShapes(): void
 			[
 				'Parameter #1 $o of method ObjectShapesAcceptance\OptionalProperty::doBaz() expects object{foo: int}, object{foo?: string} given.',
 				158,
-				'Property ($foo) type int does not accept type string.',
+				'object{foo?: string} might not have property $foo.',
 			],
 			[
 				'Parameter #1 $o of method ObjectShapesAcceptance\TestAcceptance::doFoo() expects object{foo: int}, Traversable given.',