ExtendedPropertyReflection::getName()

ondrejmirtes · ondrejmirtes · commit ff198c9d121d · 2025-04-25T15:11:29.000+02:00
diff --git a/src/Reflection/Annotations/AnnotationPropertyReflection.php b/src/Reflection/Annotations/AnnotationPropertyReflection.php
@@ -14,6 +14,7 @@ final class AnnotationPropertyReflection implements ExtendedPropertyReflection
 {
 
 	public function __construct(
+		private string $name,
 		private ClassReflection $declaringClass,
 		private Type $readableType,
 		private Type $writableType,
@@ -23,6 +24,11 @@ public function __construct(
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->declaringClass;
diff --git a/src/Reflection/Annotations/AnnotationsPropertiesClassReflectionExtension.php b/src/Reflection/Annotations/AnnotationsPropertiesClassReflectionExtension.php
@@ -52,6 +52,7 @@ private function findClassReflectionWithProperty(
 			}
 
 			return new AnnotationPropertyReflection(
+				$propertyName,
 				$declaringClass,
 				TemplateTypeHelper::resolveTemplateTypes(
 					$propertyTag->getReadableType() ?? new NeverType(),
diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
@@ -551,13 +551,13 @@ private function wrapExtendedMethod(MethodReflection $method): ExtendedMethodRef
 		return new WrappedExtendedMethodReflection($method);
 	}
 
-	private function wrapExtendedProperty(PropertyReflection $method): ExtendedPropertyReflection
+	private function wrapExtendedProperty(string $propertyName, PropertyReflection $method): ExtendedPropertyReflection
 	{
 		if ($method instanceof ExtendedPropertyReflection) {
 			return $method;
 		}
 
-		return new WrappedExtendedPropertyReflection($method);
+		return new WrappedExtendedPropertyReflection($propertyName, $method);
 	}
 
 	public function hasNativeMethod(string $methodName): bool
@@ -663,7 +663,7 @@ public function getProperty(string $propertyName, ClassMemberAccessAnswerer $sco
 					continue;
 				}
 
-				$property = $this->wrapExtendedProperty($extension->getProperty($this, $propertyName));
+				$property = $this->wrapExtendedProperty($propertyName, $extension->getProperty($this, $propertyName));
 				if ($scope->canReadProperty($property)) {
 					return $this->properties[$key] = $property;
 				}
diff --git a/src/Reflection/Dummy/ChangedTypePropertyReflection.php b/src/Reflection/Dummy/ChangedTypePropertyReflection.php
@@ -16,6 +16,11 @@ public function __construct(private ClassReflection $declaringClass, private Ext
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->reflection->getName();
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->declaringClass;
diff --git a/src/Reflection/Dummy/DummyPropertyReflection.php b/src/Reflection/Dummy/DummyPropertyReflection.php
@@ -15,6 +15,15 @@
 final class DummyPropertyReflection implements ExtendedPropertyReflection
 {
 
+	public function __construct(private string $name)
+	{
+	}
+
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		$reflectionProvider = ReflectionProviderStaticAccessor::getInstance();
diff --git a/src/Reflection/ExtendedPropertyReflection.php b/src/Reflection/ExtendedPropertyReflection.php
@@ -26,6 +26,8 @@ interface ExtendedPropertyReflection extends PropertyReflection
 
 	public const HOOK_SET = 'set';
 
+	public function getName(): string;
+
 	public function hasPhpDocType(): bool;
 
 	public function getPhpDocType(): Type;
diff --git a/src/Reflection/Php/EnumPropertyReflection.php b/src/Reflection/Php/EnumPropertyReflection.php
@@ -13,10 +13,15 @@
 final class EnumPropertyReflection implements ExtendedPropertyReflection
 {
 
-	public function __construct(private ClassReflection $declaringClass, private Type $type)
+	public function __construct(private string $name, private ClassReflection $declaringClass, private Type $type)
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->declaringClass;
diff --git a/src/Reflection/Php/PhpPropertyReflection.php b/src/Reflection/Php/PhpPropertyReflection.php
@@ -48,6 +48,11 @@ public function __construct(
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->reflection->getName();
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->declaringClass;
diff --git a/src/Reflection/Php/SimpleXMLElementProperty.php b/src/Reflection/Php/SimpleXMLElementProperty.php
@@ -19,12 +19,18 @@ final class SimpleXMLElementProperty implements ExtendedPropertyReflection
 {
 
 	public function __construct(
+		private string $name,
 		private ClassReflection $declaringClass,
 		private Type $type,
 	)
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->declaringClass;
diff --git a/src/Reflection/Php/UniversalObjectCrateProperty.php b/src/Reflection/Php/UniversalObjectCrateProperty.php
@@ -14,13 +14,19 @@ final class UniversalObjectCrateProperty implements ExtendedPropertyReflection
 {
 
 	public function __construct(
+		private string $name,
 		private ClassReflection $declaringClass,
 		private Type $readableType,
 		private Type $writableType,
 	)
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->declaringClass;
diff --git a/src/Reflection/Php/UniversalObjectCratesClassReflectionExtension.php b/src/Reflection/Php/UniversalObjectCratesClassReflectionExtension.php
@@ -85,7 +85,7 @@ public function getProperty(ClassReflection $classReflection, string $propertyNa
 			$writableType = new MixedType();
 		}
 
-		return new UniversalObjectCrateProperty($classReflection, $readableType, $writableType);
+		return new UniversalObjectCrateProperty($propertyName, $classReflection, $readableType, $writableType);
 	}
 
 }
diff --git a/src/Reflection/ResolvedPropertyReflection.php b/src/Reflection/ResolvedPropertyReflection.php
@@ -25,6 +25,11 @@ public function __construct(
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->reflection->getName();
+	}
+
 	public function getOriginalReflection(): ExtendedPropertyReflection
 	{
 		return $this->reflection;
diff --git a/src/Reflection/Type/IntersectionTypePropertyReflection.php b/src/Reflection/Type/IntersectionTypePropertyReflection.php
@@ -23,6 +23,11 @@ public function __construct(private array $properties)
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->properties[0]->getName();
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->properties[0]->getDeclaringClass();
diff --git a/src/Reflection/Type/UnionTypePropertyReflection.php b/src/Reflection/Type/UnionTypePropertyReflection.php
@@ -23,6 +23,11 @@ public function __construct(private array $properties)
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->properties[0]->getName();
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->properties[0]->getDeclaringClass();
diff --git a/src/Reflection/WrappedExtendedPropertyReflection.php b/src/Reflection/WrappedExtendedPropertyReflection.php
@@ -10,10 +10,15 @@
 final class WrappedExtendedPropertyReflection implements ExtendedPropertyReflection
 {
 
-	public function __construct(private PropertyReflection $property)
+	public function __construct(private string $name, private PropertyReflection $property)
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->property->getDeclaringClass();
diff --git a/src/Type/Enum/EnumCaseObjectType.php b/src/Type/Enum/EnumCaseObjectType.php
@@ -135,7 +135,7 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 		}
 		if ($propertyName === 'name') {
 			return new EnumUnresolvedPropertyPrototypeReflection(
-				new EnumPropertyReflection($classReflection, new ConstantStringType($this->enumCaseName)),
+				new EnumPropertyReflection($propertyName, $classReflection, new ConstantStringType($this->enumCaseName)),
 			);
 		}
 
@@ -148,7 +148,7 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 				}
 
 				return new EnumUnresolvedPropertyPrototypeReflection(
-					new EnumPropertyReflection($classReflection, $valueType),
+					new EnumPropertyReflection($propertyName, $classReflection, $valueType),
 				);
 			}
 		}
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -396,7 +396,7 @@ public function getProperty(string $propertyName, ClassMemberAccessAnswerer $sco
 
 	public function getUnresolvedPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
 	{
-		$property = new DummyPropertyReflection();
+		$property = new DummyPropertyReflection($propertyName);
 		return new CallbackUnresolvedPropertyPrototypeReflection(
 			$property,
 			$property->getDeclaringClass(),
diff --git a/src/Type/ObjectShapePropertyReflection.php b/src/Type/ObjectShapePropertyReflection.php
@@ -13,10 +13,15 @@
 final class ObjectShapePropertyReflection implements ExtendedPropertyReflection
 {
 
-	public function __construct(private Type $type)
+	public function __construct(private string $name, private Type $type)
 	{
 	}
 
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		$reflectionProvider = ReflectionProviderStaticAccessor::getInstance();
diff --git a/src/Type/ObjectShapeType.php b/src/Type/ObjectShapeType.php
@@ -113,7 +113,7 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 			throw new ShouldNotHappenException();
 		}
 
-		$property = new ObjectShapePropertyReflection($this->properties[$propertyName]);
+		$property = new ObjectShapePropertyReflection($propertyName, $this->properties[$propertyName]);
 		return new CallbackUnresolvedPropertyPrototypeReflection(
 			$property,
 			$property->getDeclaringClass(),
diff --git a/src/Type/Php/SimpleXMLElementClassPropertyReflectionExtension.php b/src/Type/Php/SimpleXMLElementClassPropertyReflectionExtension.php
@@ -20,7 +20,7 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
 
 	public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
 	{
-		return new SimpleXMLElementProperty($classReflection, new BenevolentUnionType([new ObjectType($classReflection->getName()), new NullType()]));
+		return new SimpleXMLElementProperty($propertyName, $classReflection, new BenevolentUnionType([new ObjectType($classReflection->getName()), new NullType()]));
 	}
 
 }
diff --git a/src/Type/Traits/MaybeObjectTypeTrait.php b/src/Type/Traits/MaybeObjectTypeTrait.php
@@ -52,7 +52,7 @@ public function getProperty(string $propertyName, ClassMemberAccessAnswerer $sco
 
 	public function getUnresolvedPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
 	{
-		$property = new DummyPropertyReflection();
+		$property = new DummyPropertyReflection($propertyName);
 		return new CallbackUnresolvedPropertyPrototypeReflection(
 			$property,
 			$property->getDeclaringClass(),
diff --git a/src/Type/Traits/ObjectTypeTrait.php b/src/Type/Traits/ObjectTypeTrait.php
@@ -63,7 +63,7 @@ public function getProperty(string $propertyName, ClassMemberAccessAnswerer $sco
 
 	public function getUnresolvedPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
 	{
-		$property = new DummyPropertyReflection();
+		$property = new DummyPropertyReflection($propertyName);
 		return new CallbackUnresolvedPropertyPrototypeReflection(
 			$property,
 			$property->getDeclaringClass(),

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ final class AnnotationPropertyReflection implements ExtendedPropertyReflection`
`14`	`14`	`{`
`15`	`15`
`16`	`16`	`public function __construct(`
	`17`	`+ private string $name,`
`17`	`18`	`private ClassReflection $declaringClass,`
`18`	`19`	`private Type $readableType,`
`19`	`20`	`private Type $writableType,`
`@@ -23,6 +24,11 @@ public function __construct(`
`23`	`24`	`{`
`24`	`25`	`}`
`25`	`26`
	`27`	`+ public function getName(): string`
	`28`	`+ {`
	`29`	`+ return $this->name;`
	`30`	`+ }`
	`31`	`+`
`26`	`32`	`public function getDeclaringClass(): ClassReflection`
`27`	`33`	`{`
`28`	`34`	`return $this->declaringClass;`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ private function findClassReflectionWithProperty(`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`return new AnnotationPropertyReflection(`
	`55`	`+ $propertyName,`
`55`	`56`	`$declaringClass,`
`56`	`57`	`TemplateTypeHelper::resolveTemplateTypes(`
`57`	`58`	`$propertyTag->getReadableType() ?? new NeverType(),`
Original file line number	Diff line number	Diff line change
`@@ -551,13 +551,13 @@ private function wrapExtendedMethod(MethodReflection $method): ExtendedMethodRef`
`551`	`551`	`return new WrappedExtendedMethodReflection($method);`
`552`	`552`	`}`
`553`	`553`
`554`		`- private function wrapExtendedProperty(PropertyReflection $method): ExtendedPropertyReflection`
	`554`	`+ private function wrapExtendedProperty(string $propertyName, PropertyReflection $method): ExtendedPropertyReflection`
`555`	`555`	`{`
`556`	`556`	`if ($method instanceof ExtendedPropertyReflection) {`
`557`	`557`	`return $method;`
`558`	`558`	`}`
`559`	`559`
`560`		`- return new WrappedExtendedPropertyReflection($method);`
	`560`	`+ return new WrappedExtendedPropertyReflection($propertyName, $method);`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`public function hasNativeMethod(string $methodName): bool`
`@@ -663,7 +663,7 @@ public function getProperty(string $propertyName, ClassMemberAccessAnswerer $sco`
`663`	`663`	`continue;`
`664`	`664`	`}`
`665`	`665`
`666`		`- $property = $this->wrapExtendedProperty($extension->getProperty($this, $propertyName));`
	`666`	`+ $property = $this->wrapExtendedProperty($propertyName, $extension->getProperty($this, $propertyName));`
`667`	`667`	`if ($scope->canReadProperty($property)) {`
`668`	`668`	`return $this->properties[$key] = $property;`
`669`	`669`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@ public function __construct(private ClassReflection $declaringClass, private Ext`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ public function getName(): string`
	`20`	`+ {`
	`21`	`+ return $this->reflection->getName();`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`public function getDeclaringClass(): ClassReflection`
`20`	`25`	`{`
`21`	`26`	`return $this->declaringClass;`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,15 @@`
`13`	`13`	`final class EnumPropertyReflection implements ExtendedPropertyReflection`
`14`	`14`	`{`
`15`	`15`
`16`		`- public function __construct(private ClassReflection $declaringClass, private Type $type)`
	`16`	`+ public function __construct(private string $name, private ClassReflection $declaringClass, private Type $type)`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ public function getName(): string`
	`21`	`+ {`
	`22`	`+ return $this->name;`
	`23`	`+ }`
	`24`	`+`
`20`	`25`	`public function getDeclaringClass(): ClassReflection`
`21`	`26`	`{`
`22`	`27`	`return $this->declaringClass;`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,11 @@ public function __construct(`
`48`	`48`	`{`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ public function getName(): string`
	`52`	`+ {`
	`53`	`+ return $this->reflection->getName();`
	`54`	`+ }`
	`55`	`+`
`51`	`56`	`public function getDeclaringClass(): ClassReflection`
`52`	`57`	`{`
`53`	`58`	`return $this->declaringClass;`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,18 @@ final class SimpleXMLElementProperty implements ExtendedPropertyReflection`
`19`	`19`	`{`
`20`	`20`
`21`	`21`	`public function __construct(`
	`22`	`+ private string $name,`
`22`	`23`	`private ClassReflection $declaringClass,`
`23`	`24`	`private Type $type,`
`24`	`25`	`)`
`25`	`26`	`{`
`26`	`27`	`}`
`27`	`28`
	`29`	`+ public function getName(): string`
	`30`	`+ {`
	`31`	`+ return $this->name;`
	`32`	`+ }`
	`33`	`+`
`28`	`34`	`public function getDeclaringClass(): ClassReflection`
`29`	`35`	`{`
`30`	`36`	`return $this->declaringClass;`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,19 @@ final class UniversalObjectCrateProperty implements ExtendedPropertyReflection`
`14`	`14`	`{`
`15`	`15`
`16`	`16`	`public function __construct(`
	`17`	`+ private string $name,`
`17`	`18`	`private ClassReflection $declaringClass,`
`18`	`19`	`private Type $readableType,`
`19`	`20`	`private Type $writableType,`
`20`	`21`	`)`
`21`	`22`	`{`
`22`	`23`	`}`
`23`	`24`
	`25`	`+ public function getName(): string`
	`26`	`+ {`
	`27`	`+ return $this->name;`
	`28`	`+ }`
	`29`	`+`
`24`	`30`	`public function getDeclaringClass(): ClassReflection`
`25`	`31`	`{`
`26`	`32`	`return $this->declaringClass;`