PropertyReflectionFinder - fixed #2745

ondrejmirtes · ondrejmirtes · commit d4bfc702d923 · 2020-01-04T13:56:27.000+01:00
diff --git a/src/Rules/Properties/PropertyReflectionFinder.php b/src/Rules/Properties/PropertyReflectionFinder.php
@@ -45,10 +45,6 @@ public function findPropertyReflectionFromNode($propertyFetch, Scope $scope): ?F
 
 	private function findPropertyReflection(Type $propertyHolderType, string $propertyName, Scope $scope, bool $fetchedOnThis): ?FoundPropertyReflection
 	{
-		if (!$propertyHolderType->hasProperty($propertyName)->yes()) {
-			return null;
-		}
-
 		$transformedPropertyHolderType = TypeTraverser::map($propertyHolderType, static function (Type $type, callable $traverse) use ($scope, $fetchedOnThis): Type {
 			if ($type instanceof StaticType) {
 				if ($fetchedOnThis && $scope->isInClass()) {
@@ -62,6 +58,10 @@ private function findPropertyReflection(Type $propertyHolderType, string $proper
 			return $traverse($type);
 		});
 
+		if (!$transformedPropertyHolderType->hasProperty($propertyName)->yes()) {
+			return null;
+		}
+
 		$originalProperty = $transformedPropertyHolderType->getProperty($propertyName, $scope);
 		$readableType = $this->transformPropertyType($originalProperty->getReadableType(), $transformedPropertyHolderType, $scope, $fetchedOnThis);
 		$writableType = $this->transformPropertyType($originalProperty->getWritableType(), $transformedPropertyHolderType, $scope, $fetchedOnThis);
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -189,6 +189,12 @@ public function testCollectWarnings(): void
 		$this->assertSame(PHP_VERSION_ID >= 70400 ? 22 : 27, $errors[0]->getLine());
 	}
 
+	public function testPropertyAssignIntersectionStaticTypeBug(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/property-assign-intersection-static-type-bug.php');
+		$this->assertCount(0, $errors);
+	}
+
 	/**
 	 * @param string $file
 	 * @return \PHPStan\Analyser\Error[]
diff --git a/tests/PHPStan/Analyser/data/property-assign-intersection-static-type-bug.php b/tests/PHPStan/Analyser/data/property-assign-intersection-static-type-bug.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace PropertyAssignIntersectionStaticTypeBug;
+
+abstract class Base
+{
+	/** @var string */
+	private $foo;
+
+	public function __construct(string $foo)
+	{
+		\assert($this instanceof Frontend || $this instanceof Backend);
+
+		$this->foo = $foo;
+	}
+}
+
+class Frontend extends Base
+{
+
+}
+
+class Backend extends Base
+{
+
+}
