Fix bug #81474: Make ReflectionAttribute non-final

sasezaki · nikic · commit e286313fa7a1 · 2021-10-04T14:39:46.000+02:00
This backports GH-7520 to PHP 8.0. Closes GH-7545.
diff --git a/NEWS b/NEWS
@@ -29,6 +29,9 @@ PHP                                                                        NEWS
 - PCRE:
   . Fixed bug #81424 (PCRE2 10.35 JIT performance regression). (cmb)
 
+- Reflection:
+  . ReflectionAttribute is no longer final. (sasezaki)
+
 - SPL:
   . Fixed bug #80663 (Recursive SplFixedArray::setSize() may cause double-free).
     (cmb, Nikita, Tyson Andre)
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -6618,7 +6618,6 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
 
 	INIT_CLASS_ENTRY(_reflection_entry, "ReflectionAttribute", class_ReflectionAttribute_methods);
 	reflection_init_class_handlers(&_reflection_entry);
-	_reflection_entry.ce_flags |= ZEND_ACC_FINAL;
 	reflection_attribute_ptr = zend_register_internal_class(&_reflection_entry);
 
 	REGISTER_REFLECTION_CLASS_CONST_LONG(attribute, "IS_INSTANCEOF", REFLECTION_ATTRIBUTE_IS_INSTANCEOF);
diff --git a/ext/reflection/php_reflection.stub.php b/ext/reflection/php_reflection.stub.php
@@ -653,7 +653,7 @@ private function __clone(): void {}
     private function __construct() {}
 }
 
-final class ReflectionAttribute
+class ReflectionAttribute
 {
     public function getName(): string {}
     public function getTarget(): int {}
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: 6849bff1f2b343df4bd7e6da9c8adc555731e2d3 */
+ * Stub hash: 6e98777552147f4a413db16ecd87c9a6931f9c00 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0)
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
`@@ -653,7 +653,7 @@ private function __clone(): void {}`
`653`	`653`	`private function __construct() {}`
`654`	`654`	`}`
`655`	`655`
`656`		`-final class ReflectionAttribute`
	`656`	`+class ReflectionAttribute`
`657`	`657`	`{`
`658`	`658`	`public function getName(): string {}`
`659`	`659`	`public function getTarget(): int {}`