ClassReflection - stop on first accessible property from current scope

phpstan · Nov 17, 2016 · 2e64fbb · 2e64fbb
1 parent c9ed95c
commit 2e64fbb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/src/Analyser/Scope.php b/src/Analyser/Scope.php
@@ -505,7 +505,7 @@ public function getType(Node $node): Type
 					return new MixedType(true);
 				}
 
-				return $propertyClassReflection->getProperty($node->name)->getType();
+				return $propertyClassReflection->getProperty($node->name, $this)->getType();
 			}
 		}
 

diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Reflection;
 
+use PHPStan\Analyser\Scope;
 use PHPStan\Broker\Broker;
 
 class ClassReflection
@@ -95,27 +96,20 @@ public function getMethod(string $methodName): MethodReflection
 		return $this->methods[$methodName];
 	}
 
-	public function getProperty(string $propertyName): PropertyReflection
+	public function getProperty(string $propertyName, Scope $scope = null): PropertyReflection
 	{
 		if (!isset($this->properties[$propertyName])) {
 			$privateProperty = null;
 			$publicProperty = null;
 			foreach ($this->propertiesClassReflectionExtensions as $extension) {
 				if ($extension->hasProperty($this, $propertyName)) {
 					$property = $extension->getProperty($this, $propertyName);
-					if ($privateProperty === null && !$property->isPublic()) {
-						$privateProperty = $property;
-					} elseif ($publicProperty === null && $property->isPublic()) {
-						$publicProperty = $property;
+					if ($scope !== null && $scope->canAccessProperty($property)) {
+						return $this->properties[$propertyName] = $property;
 					}
+					$this->properties[$propertyName] = $property;
 				}
 			}
-
-			if ($publicProperty !== null) {
-				return $this->properties[$propertyName] = $publicProperty;
-			} elseif ($privateProperty !== null) {
-				return $this->properties[$propertyName] = $privateProperty;
-			}
 		}
 
 		return $this->properties[$propertyName];

diff --git a/src/Rules/Classes/AccessPropertiesRule.php b/src/Rules/Classes/AccessPropertiesRule.php
@@ -77,7 +77,7 @@ public function processNode(\PhpParser\Node $node, Scope $scope): array
 			];
 		}
 
-		$propertyReflection = $propertyClassReflection->getProperty($name);
+		$propertyReflection = $propertyClassReflection->getProperty($name, $scope);
 		if (!$scope->canAccessProperty($propertyReflection)) {
 			return [
 				sprintf(

diff --git a/src/Rules/Classes/AccessStaticPropertiesRule.php b/src/Rules/Classes/AccessStaticPropertiesRule.php
@@ -83,7 +83,7 @@ public function processNode(Node $node, Scope $scope): array
 			];
 		}
 
-		$property = $classReflection->getProperty($name);
+		$property = $classReflection->getProperty($name, $scope);
 		if (!$property->isStatic()) {
 			return [
 				sprintf(

diff --git a/src/Rules/Classes/ExistingClassesInPropertiesRule.php b/src/Rules/Classes/ExistingClassesInPropertiesRule.php
@@ -39,7 +39,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$classReflection = $this->broker->getClass($className);
-		$propertyType = $classReflection->getProperty($node->name)->getType();
+		$propertyType = $classReflection->getProperty($node->name, $scope)->getType();
 
 		if ($propertyType instanceof ArrayType) {
 			$nestedItemType = $propertyType->getNestedItemType();