Fix bug #81474: Make Reflection(Attribute|Enum|EnumBackedCase) non-final

nikic · nikic · commit f2ae8a33578f · 2021-09-28T09:38:03.000+02:00
BetterReflection would like to extend these classes to provide adaptors. As our other Reflector classes are non-final, I think it makes sense to make these non-final as well. Closes GH-7520.
diff --git a/NEWS b/NEWS
@@ -9,6 +9,7 @@ PHP                                                                        NEWS
 - Reflection:
   . Fixed bug #81457 (Enum: ReflectionMethod->getDeclaringClass() return a
     ReflectionClass). (Nikita)
+  . Fixed bug #81474 (Make ReflectionEnum and related class non-final). (Nikita)
 
 - XML:
   . Fixed bug #70962 (XML_OPTION_SKIP_WHITE strips embedded whitespace).
diff --git a/ext/reflection/php_reflection.stub.php b/ext/reflection/php_reflection.stub.php
@@ -696,7 +696,7 @@ private function __construct() {}
 }
 
 /** @not-serializable */
-final class ReflectionAttribute implements Reflector
+class ReflectionAttribute implements Reflector
 {
     public function getName(): string {}
     public function getTarget(): int {}
@@ -711,7 +711,7 @@ private function __clone(): void {}
     private function __construct() {}
 }
 
-final class ReflectionEnum extends ReflectionClass
+class ReflectionEnum extends ReflectionClass
 {
     public function __construct(object|string $objectOrClass) {}
 
@@ -739,7 +739,7 @@ public function getEnum(): ReflectionEnum {}
     public function getValue(): UnitEnum {}
 }
 
-final class ReflectionEnumBackedCase extends ReflectionEnumUnitCase
+class ReflectionEnumBackedCase extends ReflectionEnumUnitCase
 {
     public function __construct(object|string $class, string $constant) {}
 
diff --git a/ext/reflection/php_reflection_arginfo.h b/ext/reflection/php_reflection_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 2316b7245c77ca2a5dd8baef53002c890eab162e */
+ * Stub hash: 0b5887f75bd4ff4935aaa5bbdbe1c18f970525c2 */
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0)
@@ -1452,7 +1452,7 @@ static zend_class_entry *register_class_ReflectionAttribute(zend_class_entry *cl
 
 	INIT_CLASS_ENTRY(ce, "ReflectionAttribute", class_ReflectionAttribute_methods);
 	class_entry = zend_register_internal_class_ex(&ce, NULL);
-	class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE;
+	class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE;
 	zend_class_implements(class_entry, 1, class_entry_Reflector);
 
 	return class_entry;
@@ -1464,7 +1464,6 @@ static zend_class_entry *register_class_ReflectionEnum(zend_class_entry *class_e
 
 	INIT_CLASS_ENTRY(ce, "ReflectionEnum", class_ReflectionEnum_methods);
 	class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionClass);
-	class_entry->ce_flags |= ZEND_ACC_FINAL;
 
 	return class_entry;
 }
@@ -1485,7 +1484,6 @@ static zend_class_entry *register_class_ReflectionEnumBackedCase(zend_class_entr
 
 	INIT_CLASS_ENTRY(ce, "ReflectionEnumBackedCase", class_ReflectionEnumBackedCase_methods);
 	class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionEnumUnitCase);
-	class_entry->ce_flags |= ZEND_ACC_FINAL;
 
 	return class_entry;
 }
diff --git a/ext/reflection/tests/ReflectionAttribute_final.phpt b/ext/reflection/tests/ReflectionAttribute_final.phpt

Original file line number	Diff line number	Diff line change
`@@ -696,7 +696,7 @@ private function __construct() {}`
`696`	`696`	`}`
`697`	`697`
`698`	`698`	`/** @not-serializable */`
`699`		`-final class ReflectionAttribute implements Reflector`
	`699`	`+class ReflectionAttribute implements Reflector`
`700`	`700`	`{`
`701`	`701`	`public function getName(): string {}`
`702`	`702`	`public function getTarget(): int {}`
`@@ -711,7 +711,7 @@ private function __clone(): void {}`
`711`	`711`	`private function __construct() {}`
`712`	`712`	`}`
`713`	`713`
`714`		`-final class ReflectionEnum extends ReflectionClass`
	`714`	`+class ReflectionEnum extends ReflectionClass`
`715`	`715`	`{`
`716`	`716`	`public function __construct(object\|string $objectOrClass) {}`
`717`	`717`
`@@ -739,7 +739,7 @@ public function getEnum(): ReflectionEnum {}`
`739`	`739`	`public function getValue(): UnitEnum {}`
`740`	`740`	`}`
`741`	`741`
`742`		`-final class ReflectionEnumBackedCase extends ReflectionEnumUnitCase`
	`742`	`+class ReflectionEnumBackedCase extends ReflectionEnumUnitCase`
`743`	`743`	`{`
`744`	`744`	`public function __construct(object\|string $class, string $constant) {}`
`745`	`745`