Review

Author: VincentLanglet

src/Dependency/DependencyResolver.php

@@ -370,7 +370,7 @@ public function resolveDependencies(Node $node, Scope $scope): NodeDependencies
 					if ($this->reflectionProvider->hasClass($className)) {
 						$propertyClassReflection = $this->reflectionProvider->getClass($className);
 						if ($propertyClassReflection->hasStaticProperty($node->name->toString())) {
-							$propertyReflection = $propertyClassReflection->getStaticProperty($node->name->toString(), $scope);
+							$propertyReflection = $propertyClassReflection->getStaticProperty($node->name->toString());
 							$this->addClassToDependencies($propertyReflection->getDeclaringClass()->getName(), $dependenciesReflections);
 						}
 					}

src/Reflection/ClassReflection.php

@@ -813,35 +813,24 @@ public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswe
 		return $this->instanceProperties[$key];
 	}
 
-	public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
+	public function getStaticProperty(string $propertyName): ExtendedPropertyReflection
 	{
 		$key = $propertyName;
-		if ($scope->isInClass()) {
-			$key = sprintf('%s-%s', $key, $scope->getClassReflection()->getCacheKey());
-		}
-
-		if (!isset($this->staticProperties[$key])) {
-			if ($this->getPhpExtension()->hasStaticProperty($this, $propertyName)) {
-				$property = $this->wrapExtendedProperty($this->getPhpExtension()->getStaticProperty($this, $propertyName));
-				if ($scope->canReadProperty($property)) {
-					return $this->staticProperties[$key] = $property;
-				}
-				$this->staticProperties[$key] = $property;
-			}
+		if (isset($this->staticProperties[$key])) {
+			return $this->staticProperties[$key];
 		}
 
-		if (!isset($this->staticProperties[$key])) {
-			if ($this->requireExtendsPropertiesClassReflectionExtension->hasStaticProperty($this, $propertyName)) {
-				$property = $this->requireExtendsPropertiesClassReflectionExtension->getStaticProperty($this, $propertyName);
-				$this->staticProperties[$key] = $property;
-			}
+		if ($this->getPhpExtension()->hasStaticProperty($this, $propertyName)) {
+			$property = $this->wrapExtendedProperty($this->getPhpExtension()->getStaticProperty($this, $propertyName));
+			return $this->staticProperties[$key] = $property;
 		}
 
-		if (!isset($this->staticProperties[$key])) {
-			throw new MissingPropertyFromReflectionException($this->getName(), $propertyName);
+		if ($this->requireExtendsPropertiesClassReflectionExtension->hasStaticProperty($this, $propertyName)) {
+			$property = $this->requireExtendsPropertiesClassReflectionExtension->getStaticProperty($this, $propertyName);
+			return $this->staticProperties[$key] = $property;
 		}
 
-		return $this->staticProperties[$key];
+		throw new MissingPropertyFromReflectionException($this->getName(), $propertyName);
 	}
 
 	public function hasNativeProperty(string $propertyName): bool

src/Rules/Properties/AccessStaticPropertiesRule.php

@@ -184,7 +184,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
 
 				while ($parentClassReflection !== null) {
 					if ($parentClassReflection->hasStaticProperty($name)) {
-						if ($scope->canReadProperty($parentClassReflection->getStaticProperty($name, $scope))) {
+						if ($scope->canReadProperty($parentClassReflection->getStaticProperty($name))) {
 							return [];
 						}
 						return [

src/Type/ObjectType.php

@@ -394,7 +394,7 @@ public function getUnresolvedStaticPropertyPrototype(string $propertyName, Class
 			throw new ClassNotFoundException($this->className);
 		}
 
-		$property = $nakedClassReflection->getStaticProperty($propertyName, $scope);
+		$property = $nakedClassReflection->getStaticProperty($propertyName);
 
 		$ancestor = $this->getAncestorWithClassName($property->getDeclaringClass()->getName());
 		$resolvedClassReflection = null;

tests/PHPStan/Reflection/Annotations/DeprecatedAnnotationsTest.php

@@ -122,7 +122,7 @@ public function testDeprecatedAnnotations(bool $deprecated, string $className, ?
 		}
 
 		foreach ($deprecatedAnnotations['staticProperty'] ?? [] as $propertyName => $deprecatedMessage) {
-			$propertyAnnotation = $class->getStaticProperty($propertyName, $scope);
+			$propertyAnnotation = $class->getStaticProperty($propertyName);
 			$this->assertSame($deprecated, $propertyAnnotation->isDeprecated()->yes());
 			$this->assertSame($deprecatedMessage, $propertyAnnotation->getDeprecatedDescription());
 		}

tests/PHPStan/Reflection/Annotations/InternalAnnotationsTest.php

@@ -145,7 +145,7 @@ public function testInternalAnnotations(bool $internal, string $className, array
 		}
 
 		foreach ($internalAnnotations['staticProperty'] ?? [] as $propertyName) {
-			$propertyAnnotation = $class->getStaticProperty($propertyName, $scope);
+			$propertyAnnotation = $class->getStaticProperty($propertyName);
 			$this->assertSame($internal, $propertyAnnotation->isInternal()->yes());
 		}