Refactor stuff I disagree with

Author: ondrejmirtes

src/Reflection/ClassReflection.php

@@ -484,8 +484,11 @@ public function hasProperty(string $propertyName): bool
 		}
 
 		// For BC purpose
-		if ($this->getPhpExtension()->hasStaticProperty($this, $propertyName)) {
-			return $this->hasPropertyCache[$propertyName] = true;
+		if ($this->getPhpExtension()->hasProperty($this, $propertyName)) {
+			$property = $this->getPhpExtension()->getProperty($this, $propertyName);
+			if ($property->isStatic()) {
+				return $this->hasPropertyCache[$propertyName] = true;
+			}
 		}
 
 		if ($this->requireExtendsPropertiesClassReflectionExtension->hasProperty($this, $propertyName)) {
@@ -527,8 +530,11 @@ public function hasStaticProperty(string $propertyName): bool
 			return $this->hasStaticPropertyCache[$propertyName];
 		}
 
-		if ($this->getPhpExtension()->hasStaticProperty($this, $propertyName)) {
-			return $this->hasStaticPropertyCache[$propertyName] = true;
+		if ($this->getPhpExtension()->hasProperty($this, $propertyName)) {
+			$property = $this->getPhpExtension()->getProperty($this, $propertyName);
+			if ($property->isStatic()) {
+				return $this->hasStaticPropertyCache[$propertyName] = true;
+			}
 		}
 
 		if ($this->requireExtendsPropertiesClassReflectionExtension->hasStaticProperty($this, $propertyName)) {
@@ -737,12 +743,14 @@ public function getProperty(string $propertyName, ClassMemberAccessAnswerer $sco
 		}
 
 		// For BC purpose
-		if ($this->getPhpExtension()->hasStaticProperty($this, $propertyName)) {
-			$property = $this->wrapExtendedProperty($propertyName, $this->getPhpExtension()->getStaticProperty($this, $propertyName));
-			if ($scope->canReadProperty($property)) {
-				return $this->properties[$key] = $property;
+		if ($this->getPhpExtension()->hasProperty($this, $propertyName)) {
+			$property = $this->wrapExtendedProperty($propertyName, $this->getPhpExtension()->getProperty($this, $propertyName));
+			if ($property->isStatic()) {
+				if ($scope->canReadProperty($property)) {
+					return $this->properties[$key] = $property;
+				}
+				$this->properties[$key] = $property;
 			}
-			$this->properties[$key] = $property;
 		}
 
 		if (!isset($this->properties[$key])) {
@@ -780,7 +788,12 @@ public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswe
 					continue;
 				}
 
-				$property = $this->wrapExtendedProperty($propertyName, $extension->getProperty($this, $propertyName));
+				$nakedProperty = $extension->getProperty($this, $propertyName);
+				if ($nakedProperty->isStatic()) {
+					continue;
+				}
+
+				$property = $this->wrapExtendedProperty($propertyName, $nakedProperty);
 				if ($scope->canReadProperty($property)) {
 					return $this->instanceProperties[$key] = $property;
 				}
@@ -809,9 +822,14 @@ public function getStaticProperty(string $propertyName): ExtendedPropertyReflect
 			return $this->staticProperties[$key];
 		}
 
-		if ($this->getPhpExtension()->hasStaticProperty($this, $propertyName)) {
-			$property = $this->wrapExtendedProperty($propertyName, $this->getPhpExtension()->getStaticProperty($this, $propertyName));
-			return $this->staticProperties[$key] = $property;
+		if ($this->getPhpExtension()->hasProperty($this, $propertyName)) {
+			$nakedProperty = $this->getPhpExtension()->getProperty($this, $propertyName);
+			if ($nakedProperty->isStatic()) {
+				$property = $this->wrapExtendedProperty($propertyName, $nakedProperty);
+				if ($property->isStatic()) {
+					return $this->staticProperties[$key] = $property;
+				}
+			}
 		}
 
 		if ($this->requireExtendsPropertiesClassReflectionExtension->hasStaticProperty($this, $propertyName)) {
@@ -824,7 +842,7 @@ public function getStaticProperty(string $propertyName): ExtendedPropertyReflect
 
 	public function hasNativeProperty(string $propertyName): bool
 	{
-		return $this->getPhpExtension()->hasNativeProperty($this, $propertyName);
+		return $this->getPhpExtension()->hasProperty($this, $propertyName);
 	}
 
 	public function getNativeProperty(string $propertyName): PhpPropertyReflection

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -71,9 +71,6 @@ final class PhpClassReflectionExtension
 	/** @var PhpPropertyReflection[][] */
 	private array $propertiesIncludingAnnotations = [];
 
-	/** @var ExtendedPropertyReflection[][] */
-	private array $staticPropertiesIncludingAnnotations = [];
-
 	/** @var PhpPropertyReflection[][] */
 	private array $nativeProperties = [];
 
@@ -121,17 +118,6 @@ public function evictPrivateSymbols(string $classCacheKey): void
 				unset($this->propertiesIncludingAnnotations[$key][$name]);
 			}
 		}
-		foreach ($this->staticPropertiesIncludingAnnotations as $key => $properties) {
-			if ($key !== $classCacheKey) {
-				continue;
-			}
-			foreach ($properties as $name => $property) {
-				if (!$property->isPrivate()) {
-					continue;
-				}
-				unset($this->staticPropertiesIncludingAnnotations[$key][$name]);
-			}
-		}
 		foreach ($this->nativeProperties as $key => $properties) {
 			if ($key !== $classCacheKey) {
 				continue;
@@ -169,10 +155,7 @@ public function evictPrivateSymbols(string $classCacheKey): void
 
 	public function hasProperty(ClassReflection $classReflection, string $propertyName): bool
 	{
-		$nativeReflection = $classReflection->getNativeReflection();
-
-		return $nativeReflection->hasProperty($propertyName)
-			&& !$nativeReflection->getProperty($propertyName)->isStatic();
+		return $classReflection->getNativeReflection()->hasProperty($propertyName);
 	}
 
 	public function getProperty(ClassReflection $classReflection, string $propertyName): PhpPropertyReflection
@@ -184,28 +167,6 @@ public function getProperty(ClassReflection $classReflection, string $propertyNa
 		return $this->propertiesIncludingAnnotations[$classReflection->getCacheKey()][$propertyName];
 	}
 
-	public function hasStaticProperty(ClassReflection $classReflection, string $propertyName): bool
-	{
-		$nativeReflection = $classReflection->getNativeReflection();
-
-		return $nativeReflection->hasProperty($propertyName)
-			&& $nativeReflection->getProperty($propertyName)->isStatic();
-	}
-
-	public function getStaticProperty(ClassReflection $classReflection, string $propertyName): ExtendedPropertyReflection
-	{
-		if (!isset($this->staticPropertiesIncludingAnnotations[$classReflection->getCacheKey()][$propertyName])) {
-			$this->staticPropertiesIncludingAnnotations[$classReflection->getCacheKey()][$propertyName] = $this->createProperty($classReflection, $propertyName, false);
-		}
-
-		return $this->staticPropertiesIncludingAnnotations[$classReflection->getCacheKey()][$propertyName];
-	}
-
-	public function hasNativeProperty(ClassReflection $classReflection, string $propertyName): bool
-	{
-		return $classReflection->getNativeReflection()->hasProperty($propertyName);
-	}
-
 	public function getNativeProperty(ClassReflection $classReflection, string $propertyName): PhpPropertyReflection
 	{
 		if (!isset($this->nativeProperties[$classReflection->getCacheKey()][$propertyName])) {