Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before.

Guilherme Blanco · Julien Pauli · commit 094d409b3d34 · 2014-12-12T17:29:54.000+01:00
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
@@ -445,7 +445,7 @@ void zend_register_closure_ce(TSRMLS_D) /* {{{ */
 
 	INIT_CLASS_ENTRY(ce, "Closure", closure_functions);
 	zend_ce_closure = zend_register_internal_class(&ce TSRMLS_CC);
-	zend_ce_closure->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	zend_ce_closure->ce_flags |= ZEND_ACC_FINAL;
 	zend_ce_closure->create_object = zend_closure_new;
 	zend_ce_closure->serialize = zend_class_serialize_deny;
 	zend_ce_closure->unserialize = zend_class_unserialize_deny;
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
@@ -182,7 +182,6 @@ typedef struct _zend_try_catch_element {
 /* ZEND_ACC_EXPLICIT_ABSTRACT_CLASS denotes that a class was explicitly defined as abstract by using the keyword. */
 #define ZEND_ACC_IMPLICIT_ABSTRACT_CLASS	0x10
 #define ZEND_ACC_EXPLICIT_ABSTRACT_CLASS	0x20
-#define ZEND_ACC_FINAL_CLASS	            0x40
 #define ZEND_ACC_INTERFACE		            0x80
 #define ZEND_ACC_TRAIT						0x120
 
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
@@ -671,7 +671,7 @@ void zend_register_generator_ce(TSRMLS_D) /* {{{ */
 
 	INIT_CLASS_ENTRY(ce, "Generator", generator_functions);
 	zend_ce_generator = zend_register_internal_class(&ce TSRMLS_CC);
-	zend_ce_generator->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	zend_ce_generator->ce_flags |= ZEND_ACC_FINAL;
 	zend_ce_generator->create_object = zend_generator_create;
 	zend_ce_generator->serialize = zend_class_serialize_deny;
 	zend_ce_generator->unserialize = zend_class_unserialize_deny;
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -727,7 +727,7 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
 		&& !(parent_ce->ce_flags & ZEND_ACC_INTERFACE)) {
 		zend_error_noreturn(E_COMPILE_ERROR, "Interface %s may not inherit from class (%s)", ce->name->val, parent_ce->name->val);
 	}
-	if (parent_ce->ce_flags & ZEND_ACC_FINAL_CLASS) {
+	if (parent_ce->ce_flags & ZEND_ACC_FINAL) {
 		zend_error_noreturn(E_COMPILE_ERROR, "Class %s may not inherit from final class (%s)", ce->name->val, parent_ce->name->val);
 	}
 
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -435,7 +435,7 @@ class_declaration_statement:
 class_type:
 		T_CLASS				{ $$ = 0; }
 	|	T_ABSTRACT T_CLASS	{ $$ = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; }
-	|	T_FINAL T_CLASS		{ $$ = ZEND_ACC_FINAL_CLASS; }
+	|	T_FINAL T_CLASS		{ $$ = ZEND_ACC_FINAL; }
 	|	T_TRAIT				{ $$ = ZEND_ACC_TRAIT; }
 ;
 
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
@@ -625,7 +625,7 @@ PHP_MINIT_FUNCTION(mysqli)
 	zend_declare_property_null(ce, "embedded", 			sizeof("embedded") - 1, ZEND_ACC_PUBLIC TSRMLS_CC);
 	zend_declare_property_null(ce, "reconnect",			sizeof("reconnect") - 1, ZEND_ACC_PUBLIC TSRMLS_CC);
 	zend_declare_property_null(ce, "report_mode", 		sizeof("report_mode") - 1, ZEND_ACC_PUBLIC TSRMLS_CC);
-	ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	ce->ce_flags |= ZEND_ACC_FINAL;
 	zend_hash_add_ptr(&classes, ce->name, &mysqli_driver_properties);
 
 	REGISTER_MYSQLI_CLASS_ENTRY("mysqli", mysqli_link_class_entry, mysqli_link_methods);
@@ -655,7 +655,7 @@ PHP_MINIT_FUNCTION(mysqli)
 
 	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_warning", mysqli_warning_class_entry, mysqli_warning_methods);
 	ce = mysqli_warning_class_entry;
-	ce->ce_flags |= ZEND_ACC_FINAL_CLASS | ZEND_ACC_PROTECTED;
+	ce->ce_flags |= ZEND_ACC_FINAL;
 	zend_hash_init(&mysqli_warning_properties, 0, NULL, free_prop_handler, 1);
 	MYSQLI_ADD_PROPERTIES(&mysqli_warning_properties, mysqli_warning_property_entries);
 	zend_declare_property_null(ce, "message", 	sizeof("message") - 1, ZEND_ACC_PUBLIC TSRMLS_CC);
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
@@ -2292,7 +2292,7 @@ void pdo_stmt_init(TSRMLS_D)
 
 	INIT_CLASS_ENTRY(ce, "PDORow", pdo_row_functions);
 	pdo_row_ce = zend_register_internal_class(&ce TSRMLS_CC);
-	pdo_row_ce->ce_flags |= ZEND_ACC_FINAL_CLASS; /* when removing this a lot of handlers need to be redone */
+	pdo_row_ce->ce_flags |= ZEND_ACC_FINAL; /* when removing this a lot of handlers need to be redone */
 	pdo_row_ce->create_object = pdo_row_new;
 	pdo_row_ce->serialize = pdo_row_serialize;
 }
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -5308,11 +5308,11 @@ void phar_object_init(TSRMLS_D) /* {{{ */
 #else
 	INIT_CLASS_ENTRY(ce, "Phar", php_archive_methods);
 	phar_ce_archive = zend_register_internal_class(&ce TSRMLS_CC);
-	phar_ce_archive->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	phar_ce_archive->ce_flags |= ZEND_ACC_FINAL;
 
 	INIT_CLASS_ENTRY(ce, "PharData", php_archive_methods);
 	phar_ce_data = zend_register_internal_class(&ce TSRMLS_CC);
-	phar_ce_data->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	phar_ce_data->ce_flags |= ZEND_ACC_FINAL;
 #endif
 
 	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "BZ2", PHAR_ENT_COMPRESSED_BZ2)
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -395,7 +395,7 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in
 		if (ce->ce_flags & (ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
 			string_printf(str, "abstract ");
 		}
-		if (ce->ce_flags & ZEND_ACC_FINAL_CLASS) {
+		if (ce->ce_flags & ZEND_ACC_FINAL) {
 			string_printf(str, "final ");
 		}
 		string_printf(str, "class ");
@@ -1557,7 +1557,7 @@ ZEND_METHOD(reflection, getModifierNames)
 	if (modifiers & (ZEND_ACC_ABSTRACT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
 		add_next_index_stringl(return_value, "abstract", sizeof("abstract")-1);
 	}
-	if (modifiers & (ZEND_ACC_FINAL | ZEND_ACC_FINAL_CLASS)) {
+	if (modifiers & ZEND_ACC_FINAL) {
 		add_next_index_stringl(return_value, "final", sizeof("final")-1);
 	}
 	if (modifiers & ZEND_ACC_IMPLICIT_PUBLIC) {
@@ -4162,7 +4162,7 @@ ZEND_METHOD(reflection_class, isTrait)
    Returns whether this class is final */
 ZEND_METHOD(reflection_class, isFinal)
 {
-	_class_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_FINAL_CLASS);
+	_class_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_FINAL);
 }
 /* }}} */
 
@@ -4290,7 +4290,7 @@ ZEND_METHOD(reflection_class, newInstanceWithoutConstructor)
 	METHOD_NOTSTATIC(reflection_class_ptr);
 	GET_REFLECTION_OBJECT_PTR(ce);
 
-	if (ce->create_object != NULL && ce->ce_flags & ZEND_ACC_FINAL_CLASS) {
+	if (ce->create_object != NULL && ce->ce_flags & ZEND_ACC_FINAL) {
 		zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Class %s is an internal class marked as final that cannot be instantiated without invoking its constructor", ce->name->val);
 	}
 
@@ -6187,7 +6187,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
 
 	REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_IMPLICIT_ABSTRACT", ZEND_ACC_IMPLICIT_ABSTRACT_CLASS);
 	REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_EXPLICIT_ABSTRACT", ZEND_ACC_EXPLICIT_ABSTRACT_CLASS);
-	REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_FINAL", ZEND_ACC_FINAL_CLASS);
+	REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_FINAL", ZEND_ACC_FINAL);
 
 	INIT_CLASS_ENTRY(_reflection_entry, "ReflectionObject", reflection_object_functions);
 	_reflection_entry.create_object = reflection_objects_new;
diff --git a/ext/reflection/tests/ReflectionClass_getModifiers_basic.phpt b/ext/reflection/tests/ReflectionClass_getModifiers_basic.phpt
@@ -30,7 +30,7 @@ dump_modifiers('g');
 --EXPECT--
 int(0)
 int(32)
-int(64)
+int(4)
 int(128)
 int(524288)
 int(524416)
diff --git a/ext/reflection/tests/ReflectionClass_modifiers_001.phpt b/ext/reflection/tests/ReflectionClass_modifiers_001.phpt
@@ -37,7 +37,7 @@ int(0)
 bool(true)
 bool(false)
 bool(false)
-int(64)
+int(4)
 bool(false)
 bool(true)
 bool(false)
diff --git a/ext/reflection/tests/ReflectionClass_toString_001.phpt b/ext/reflection/tests/ReflectionClass_toString_001.phpt
@@ -14,7 +14,7 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
   - Constants [3] {
     Constant [ integer IS_IMPLICIT_ABSTRACT ] { 16 }
     Constant [ integer IS_EXPLICIT_ABSTRACT ] { 32 }
-    Constant [ integer IS_FINAL ] { 64 }
+    Constant [ integer IS_FINAL ] { 4 }
   }
 
   - Static properties [0] {
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
@@ -1037,7 +1037,7 @@ static PHP_MINIT_FUNCTION(tidy)
 
 	REGISTER_INI_ENTRIES();
 	REGISTER_TIDY_CLASS(tidy, doc,	NULL, 0);
-	REGISTER_TIDY_CLASS(tidyNode, node,	NULL, ZEND_ACC_FINAL_CLASS);
+	REGISTER_TIDY_CLASS(tidyNode, node,	NULL, ZEND_ACC_FINAL);
 
 	tidy_object_handlers_doc.cast_object = tidy_doc_cast_handler;
 	tidy_object_handlers_node.cast_object = tidy_node_cast_handler;

Original file line number	Diff line number	Diff line change
`@@ -727,7 +727,7 @@ ZEND_API void zend_do_inheritance(zend_class_entry ce, zend_class_entry parent`
`727`	`727`	`&& !(parent_ce->ce_flags & ZEND_ACC_INTERFACE)) {`
`728`	`728`	`zend_error_noreturn(E_COMPILE_ERROR, "Interface %s may not inherit from class (%s)", ce->name->val, parent_ce->name->val);`
`729`	`729`	`}`
`730`		`- if (parent_ce->ce_flags & ZEND_ACC_FINAL_CLASS) {`
	`730`	`+ if (parent_ce->ce_flags & ZEND_ACC_FINAL) {`
`731`	`731`	`zend_error_noreturn(E_COMPILE_ERROR, "Class %s may not inherit from final class (%s)", ce->name->val, parent_ce->name->val);`
`732`	`732`	`}`
`733`	`733`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ class_declaration_statement:`
`435`	`435`	`class_type:`
`436`	`436`	`T_CLASS { $$ = 0; }`
`437`	`437`	`\| T_ABSTRACT T_CLASS { $$ = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; }`
`438`		`- \| T_FINAL T_CLASS { $$ = ZEND_ACC_FINAL_CLASS; }`
	`438`	`+ \| T_FINAL T_CLASS { $$ = ZEND_ACC_FINAL; }`
`439`	`439`	`\| T_TRAIT { $$ = ZEND_ACC_TRAIT; }`
`440`	`440`	`;`
`441`	`441`
Original file line number	Diff line number	Diff line change
`@@ -2292,7 +2292,7 @@ void pdo_stmt_init(TSRMLS_D)`
`2292`	`2292`
`2293`	`2293`	`INIT_CLASS_ENTRY(ce, "PDORow", pdo_row_functions);`
`2294`	`2294`	`pdo_row_ce = zend_register_internal_class(&ce TSRMLS_CC);`
`2295`		`- pdo_row_ce->ce_flags \|= ZEND_ACC_FINAL_CLASS; /* when removing this a lot of handlers need to be redone */`
	`2295`	`+ pdo_row_ce->ce_flags \|= ZEND_ACC_FINAL; /* when removing this a lot of handlers need to be redone */`
`2296`	`2296`	`pdo_row_ce->create_object = pdo_row_new;`
`2297`	`2297`	`pdo_row_ce->serialize = pdo_row_serialize;`
`2298`	`2298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ static void _class_string(string str, zend_class_entry ce, zval obj, char in`
`395`	`395`	`if (ce->ce_flags & (ZEND_ACC_IMPLICIT_ABSTRACT_CLASS\|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {`
`396`	`396`	`string_printf(str, "abstract ");`
`397`	`397`	`}`
`398`		`- if (ce->ce_flags & ZEND_ACC_FINAL_CLASS) {`
	`398`	`+ if (ce->ce_flags & ZEND_ACC_FINAL) {`
`399`	`399`	`string_printf(str, "final ");`
`400`	`400`	`}`
`401`	`401`	`string_printf(str, "class ");`
`@@ -1557,7 +1557,7 @@ ZEND_METHOD(reflection, getModifierNames)`
`1557`	`1557`	`if (modifiers & (ZEND_ACC_ABSTRACT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {`
`1558`	`1558`	`add_next_index_stringl(return_value, "abstract", sizeof("abstract")-1);`
`1559`	`1559`	`}`
`1560`		`- if (modifiers & (ZEND_ACC_FINAL \| ZEND_ACC_FINAL_CLASS)) {`
	`1560`	`+ if (modifiers & ZEND_ACC_FINAL) {`
`1561`	`1561`	`add_next_index_stringl(return_value, "final", sizeof("final")-1);`
`1562`	`1562`	`}`
`1563`	`1563`	`if (modifiers & ZEND_ACC_IMPLICIT_PUBLIC) {`
`@@ -4162,7 +4162,7 @@ ZEND_METHOD(reflection_class, isTrait)`
`4162`	`4162`	`Returns whether this class is final */`
`4163`	`4163`	`ZEND_METHOD(reflection_class, isFinal)`
`4164`	`4164`	`{`
`4165`		`- _class_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_FINAL_CLASS);`
	`4165`	`+ _class_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_FINAL);`
`4166`	`4166`	`}`
`4167`	`4167`	`/* }}} */`
`4168`	`4168`
`@@ -4290,7 +4290,7 @@ ZEND_METHOD(reflection_class, newInstanceWithoutConstructor)`
`4290`	`4290`	`METHOD_NOTSTATIC(reflection_class_ptr);`
`4291`	`4291`	`GET_REFLECTION_OBJECT_PTR(ce);`
`4292`	`4292`
`4293`		`- if (ce->create_object != NULL && ce->ce_flags & ZEND_ACC_FINAL_CLASS) {`
	`4293`	`+ if (ce->create_object != NULL && ce->ce_flags & ZEND_ACC_FINAL) {`
`4294`	`4294`	`zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Class %s is an internal class marked as final that cannot be instantiated without invoking its constructor", ce->name->val);`
`4295`	`4295`	`}`
`4296`	`4296`
`@@ -6187,7 +6187,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */`
`6187`	`6187`
`6188`	`6188`	`REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_IMPLICIT_ABSTRACT", ZEND_ACC_IMPLICIT_ABSTRACT_CLASS);`
`6189`	`6189`	`REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_EXPLICIT_ABSTRACT", ZEND_ACC_EXPLICIT_ABSTRACT_CLASS);`
`6190`		`- REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_FINAL", ZEND_ACC_FINAL_CLASS);`
	`6190`	`+ REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_FINAL", ZEND_ACC_FINAL);`
`6191`	`6191`
`6192`	`6192`	`INIT_CLASS_ENTRY(_reflection_entry, "ReflectionObject", reflection_object_functions);`
`6193`	`6193`	`_reflection_entry.create_object = reflection_objects_new;`