Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

Author: ondrejmirtes

src/Type/ObjectType.php

@@ -19,12 +19,14 @@
 use PHPStan\Reflection\ClassConstantReflection;
 use PHPStan\Reflection\ClassMemberAccessAnswerer;
 use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\Dummy\DummyPropertyReflection;
 use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\ExtendedPropertyReflection;
 use PHPStan\Reflection\Php\UniversalObjectCratesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Reflection\ReflectionProviderStaticAccessor;
 use PHPStan\Reflection\TrivialParametersAcceptor;
+use PHPStan\Reflection\Type\CallbackUnresolvedPropertyPrototypeReflection;
 use PHPStan\Reflection\Type\CalledOnTypeUnresolvedMethodPrototypeReflection;
 use PHPStan\Reflection\Type\CalledOnTypeUnresolvedPropertyPrototypeReflection;
 use PHPStan\Reflection\Type\UnionTypeUnresolvedPropertyPrototypeReflection;
@@ -158,7 +160,8 @@ public function hasProperty(string $propertyName): TrinaryLogic
 			return TrinaryLogic::createMaybe();
 		}
 
-		if ($classReflection->hasProperty($propertyName)) {
+		$classHasProperty = RecursionGuard::run($this, static fn (): bool => $classReflection->hasProperty($propertyName));
+		if ($classHasProperty === true || $classHasProperty instanceof ErrorType) {
 			return TrinaryLogic::createYes();
 		}
 
@@ -224,7 +227,17 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 			throw new ClassNotFoundException($this->className);
 		}
 
-		$property = $nakedClassReflection->getProperty($propertyName, $scope);
+		$property = RecursionGuard::run($this, static fn () => $nakedClassReflection->getProperty($propertyName, $scope));
+		if ($property instanceof ErrorType) {
+			$property = new DummyPropertyReflection();
+
+			return new CallbackUnresolvedPropertyPrototypeReflection(
+				$property,
+				$property->getDeclaringClass(),
+				false,
+				static fn (Type $type): Type => $type,
+			);
+		}
 
 		$ancestor = $this->getAncestorWithClassName($property->getDeclaringClass()->getName());
 		$resolvedClassReflection = null;
@@ -246,6 +259,9 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 		);
 	}
 
+	/**
+	 * @deprecated Not in use anymore.
+	 */
 	public function getPropertyWithoutTransformingStatic(string $propertyName, ClassMemberAccessAnswerer $scope): PropertyReflection
 	{
 		$classReflection = $this->getNakedClassReflection();

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -562,6 +562,12 @@ public function testBug6442(): void
 		$this->assertSame(9, $errors[1]->getLine());
 	}
 
+	public function testBug13057(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-13057.php');
+		$this->assertNoErrors($errors);
+	}
+
 	public function testBug6375(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-6375.php');

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

@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace Bug13057;
+
+use AllowDynamicProperties;
+use function PHPStan\Testing\assertType;
+
+/**
+ * @property ModelB & object{extra: string} $modelB
+ */
+#[AllowDynamicProperties]
+class ModelA
+{}
+
+/**
+ * @property ModelA & object{extra: string} $modelA
+ */
+#[AllowDynamicProperties]
+class ModelB
+{}
+
+function (ModelA $a, ModelB $b): void {
+	assertType('string', $a->modelB->extra);
+	assertType('string', $b->modelA->extra);
+};