diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 229af38c2a8c4..35e8301a855f3 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3488,9 +3488,16 @@ static zend_class_entry *do_register_internal_class(zend_class_entry *orig_class */ ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce) /* {{{ */ { - zend_class_entry *register_class; + return zend_register_internal_class_with_flags(class_entry, parent_ce, 0); +} +/* }}} */ - register_class = zend_register_internal_class(class_entry); +ZEND_API zend_class_entry *zend_register_internal_class_with_flags( + zend_class_entry *class_entry, + zend_class_entry *parent_ce, + uint32_t ce_flags +) { + zend_class_entry *register_class = do_register_internal_class(class_entry, ce_flags); if (parent_ce) { zend_do_inheritance(register_class, parent_ce); @@ -3499,7 +3506,6 @@ ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *cla return register_class; } -/* }}} */ ZEND_API void zend_class_implements(zend_class_entry *class_entry, int num_interfaces, ...) /* {{{ */ { diff --git a/Zend/zend_API.h b/Zend/zend_API.h index ab67dd5717e69..00d3692686d90 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -390,6 +390,7 @@ ZEND_API void zend_add_magic_method(zend_class_entry *ce, zend_function *fptr, z ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry); ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce); +ZEND_API zend_class_entry *zend_register_internal_class_with_flags(zend_class_entry *class_entry, zend_class_entry *parent_ce, uint32_t flags); ZEND_API zend_class_entry *zend_register_internal_interface(zend_class_entry *orig_class_entry); ZEND_API void zend_class_implements(zend_class_entry *class_entry, int num_interfaces, ...); diff --git a/Zend/zend_attributes_arginfo.h b/Zend/zend_attributes_arginfo.h index 2a8022d0bd181..817dacbd44d50 100644 --- a/Zend/zend_attributes_arginfo.h +++ b/Zend/zend_attributes_arginfo.h @@ -81,8 +81,7 @@ static zend_class_entry *register_class_Attribute(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Attribute", class_Attribute_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zval const_TARGET_CLASS_value; ZVAL_LONG(&const_TARGET_CLASS_value, ZEND_ATTRIBUTE_TARGET_CLASS); @@ -153,8 +152,7 @@ static zend_class_entry *register_class_ReturnTypeWillChange(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReturnTypeWillChange", class_ReturnTypeWillChange_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zend_string *attribute_name_Attribute_class_ReturnTypeWillChange_0 = zend_string_init_interned("Attribute", sizeof("Attribute") - 1, 1); zend_attribute *attribute_Attribute_class_ReturnTypeWillChange_0 = zend_add_class_attribute(class_entry, attribute_name_Attribute_class_ReturnTypeWillChange_0, 1); @@ -171,8 +169,7 @@ static zend_class_entry *register_class_AllowDynamicProperties(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "AllowDynamicProperties", class_AllowDynamicProperties_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zend_string *attribute_name_Attribute_class_AllowDynamicProperties_0 = zend_string_init_interned("Attribute", sizeof("Attribute") - 1, 1); zend_attribute *attribute_Attribute_class_AllowDynamicProperties_0 = zend_add_class_attribute(class_entry, attribute_name_Attribute_class_AllowDynamicProperties_0, 1); @@ -189,8 +186,7 @@ static zend_class_entry *register_class_SensitiveParameter(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SensitiveParameter", class_SensitiveParameter_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES); zend_string *attribute_name_Attribute_class_SensitiveParameter_0 = zend_string_init_interned("Attribute", sizeof("Attribute") - 1, 1); zend_attribute *attribute_Attribute_class_SensitiveParameter_0 = zend_add_class_attribute(class_entry, attribute_name_Attribute_class_SensitiveParameter_0, 1); @@ -207,8 +203,7 @@ static zend_class_entry *register_class_SensitiveParameterValue(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SensitiveParameterValue", class_SensitiveParameterValue_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zval property_value_default_value; ZVAL_UNDEF(&property_value_default_value); @@ -224,8 +219,7 @@ static zend_class_entry *register_class_Override(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Override", class_Override_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES); zend_string *attribute_name_Attribute_class_Override_0 = zend_string_init_interned("Attribute", sizeof("Attribute") - 1, 1); zend_attribute *attribute_Attribute_class_Override_0 = zend_add_class_attribute(class_entry, attribute_name_Attribute_class_Override_0, 1); @@ -242,8 +236,7 @@ static zend_class_entry *register_class_Deprecated(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Deprecated", class_Deprecated_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES); zval property_message_default_value; ZVAL_UNDEF(&property_message_default_value); diff --git a/Zend/zend_builtin_functions_arginfo.h b/Zend/zend_builtin_functions_arginfo.h index b6b9b8753a450..612fd1d275d55 100644 --- a/Zend/zend_builtin_functions_arginfo.h +++ b/Zend/zend_builtin_functions_arginfo.h @@ -373,8 +373,7 @@ static zend_class_entry *register_class_stdClass(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "stdClass", class_stdClass_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES); zend_string *attribute_name_AllowDynamicProperties_class_stdClass_0 = zend_string_init_interned("AllowDynamicProperties", sizeof("AllowDynamicProperties") - 1, 1); zend_add_class_attribute(class_entry, attribute_name_AllowDynamicProperties_class_stdClass_0, 0); diff --git a/Zend/zend_closures_arginfo.h b/Zend/zend_closures_arginfo.h index dfd70418620bd..57066078a8821 100644 --- a/Zend/zend_closures_arginfo.h +++ b/Zend/zend_closures_arginfo.h @@ -44,8 +44,7 @@ static zend_class_entry *register_class_Closure(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Closure", class_Closure_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/Zend/zend_exceptions_arginfo.h b/Zend/zend_exceptions_arginfo.h index 7899877f53046..5dc7d7ac3f45f 100644 --- a/Zend/zend_exceptions_arginfo.h +++ b/Zend/zend_exceptions_arginfo.h @@ -194,7 +194,7 @@ static zend_class_entry *register_class_Exception(zend_class_entry *class_entry_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Exception", class_Exception_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_Throwable); zval property_message_default_value; @@ -248,7 +248,7 @@ static zend_class_entry *register_class_ErrorException(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ErrorException", class_ErrorException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); zval property_severity_default_value; ZVAL_LONG(&property_severity_default_value, E_ERROR); @@ -264,7 +264,7 @@ static zend_class_entry *register_class_Error(zend_class_entry *class_entry_Thro zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Error", class_Error_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_Throwable); zval property_message_default_value; @@ -318,7 +318,7 @@ static zend_class_entry *register_class_CompileError(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "CompileError", class_CompileError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, 0); return class_entry; } @@ -328,7 +328,7 @@ static zend_class_entry *register_class_ParseError(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ParseError", class_ParseError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_CompileError); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_CompileError, 0); return class_entry; } @@ -338,7 +338,7 @@ static zend_class_entry *register_class_TypeError(zend_class_entry *class_entry_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "TypeError", class_TypeError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, 0); return class_entry; } @@ -348,7 +348,7 @@ static zend_class_entry *register_class_ArgumentCountError(zend_class_entry *cla zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ArgumentCountError", class_ArgumentCountError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_TypeError); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_TypeError, 0); return class_entry; } @@ -358,7 +358,7 @@ static zend_class_entry *register_class_ValueError(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ValueError", class_ValueError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, 0); return class_entry; } @@ -368,7 +368,7 @@ static zend_class_entry *register_class_ArithmeticError(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ArithmeticError", class_ArithmeticError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, 0); return class_entry; } @@ -378,7 +378,7 @@ static zend_class_entry *register_class_DivisionByZeroError(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DivisionByZeroError", class_DivisionByZeroError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ArithmeticError); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ArithmeticError, 0); return class_entry; } @@ -388,7 +388,7 @@ static zend_class_entry *register_class_UnhandledMatchError(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "UnhandledMatchError", class_UnhandledMatchError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, 0); return class_entry; } @@ -398,7 +398,7 @@ static zend_class_entry *register_class_RequestParseBodyException(zend_class_ent zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RequestParseBodyException", class_RequestParseBodyException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); return class_entry; } diff --git a/Zend/zend_fibers_arginfo.h b/Zend/zend_fibers_arginfo.h index 950dbd26ed60f..9db4db8d802af 100644 --- a/Zend/zend_fibers_arginfo.h +++ b/Zend/zend_fibers_arginfo.h @@ -75,8 +75,7 @@ static zend_class_entry *register_class_Fiber(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Fiber", class_Fiber_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -86,8 +85,7 @@ static zend_class_entry *register_class_FiberError(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "FiberError", class_FiberError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, ZEND_ACC_FINAL); return class_entry; } diff --git a/Zend/zend_generators_arginfo.h b/Zend/zend_generators_arginfo.h index be7131fc8ff26..dd8200d4719af 100644 --- a/Zend/zend_generators_arginfo.h +++ b/Zend/zend_generators_arginfo.h @@ -59,8 +59,7 @@ static zend_class_entry *register_class_Generator(zend_class_entry *class_entry_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Generator", class_Generator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Iterator); return class_entry; @@ -71,7 +70,7 @@ static zend_class_entry *register_class_ClosedGeneratorException(zend_class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ClosedGeneratorException", class_ClosedGeneratorException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); return class_entry; } diff --git a/Zend/zend_interfaces_arginfo.h b/Zend/zend_interfaces_arginfo.h index bcdc8dd87c473..27af62825f90a 100644 --- a/Zend/zend_interfaces_arginfo.h +++ b/Zend/zend_interfaces_arginfo.h @@ -198,8 +198,7 @@ static zend_class_entry *register_class_InternalIterator(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "InternalIterator", class_InternalIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Iterator); return class_entry; diff --git a/Zend/zend_weakrefs_arginfo.h b/Zend/zend_weakrefs_arginfo.h index 25c137c9d76b6..eba02f03fb13c 100644 --- a/Zend/zend_weakrefs_arginfo.h +++ b/Zend/zend_weakrefs_arginfo.h @@ -66,8 +66,7 @@ static zend_class_entry *register_class_WeakReference(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "WeakReference", class_WeakReference_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -77,8 +76,7 @@ static zend_class_entry *register_class_WeakMap(zend_class_entry *class_entry_Ar zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "WeakMap", class_WeakMap_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 3, class_entry_ArrayAccess, class_entry_Countable, class_entry_IteratorAggregate); return class_entry; diff --git a/build/gen_stub.php b/build/gen_stub.php index 1d92ddd46b9ee..2b6af02e190f2 100755 --- a/build/gen_stub.php +++ b/build/gen_stub.php @@ -3274,11 +3274,18 @@ public function getRegistration(array $allConstInfos): string $code .= "static zend_class_entry *register_class_$escapedName(" . (empty($params) ? "void" : implode(", ", $params)) . ")\n"; $code .= "{\n"; + + $flagCodes = generateVersionDependentFlagCode("%s", $this->getFlagsByPhpVersion(), $this->phpVersionIdMinimumCompatibility); + $flags = implode("", $flagCodes); + if ($this->type === "enum") { $name = addslashes((string) $this->name); $backingType = $this->enumBackingType ? $this->enumBackingType->toTypeCode() : "IS_UNDEF"; $code .= "\tzend_class_entry *class_entry = zend_register_internal_enum(\"$name\", $backingType, class_{$escapedName}_methods);\n"; + if ($flags !== "") { + $code .= "\tclass_entry->ce_flags |= $flags\n"; + } } else { $code .= "\tzend_class_entry ce, *class_entry;\n\n"; if (count($this->name->getParts()) > 1) { @@ -3291,15 +3298,29 @@ public function getRegistration(array $allConstInfos): string } if ($this->type === "class" || $this->type === "trait") { - $code .= "\tclass_entry = zend_register_internal_class_ex(&ce, " . (isset($this->extends[0]) ? "class_entry_" . str_replace("\\", "_", $this->extends[0]->toString()) : "NULL") . ");\n"; + if (!$php84MinimumCompatibility) { + $code .= "#if (PHP_VERSION_ID >= " . PHP_84_VERSION_ID . ")\n"; + } + + $code .= "\tclass_entry = zend_register_internal_class_with_flags(&ce, " . (isset($this->extends[0]) ? "class_entry_" . str_replace("\\", "_", $this->extends[0]->toString()) : "NULL") . ", " . ($flags ?: 0) . ");\n"; + + if (!$php84MinimumCompatibility) { + $code .= "#else\n"; + + $code .= "\tclass_entry = zend_register_internal_class_ex(&ce, " . (isset($this->extends[0]) ? "class_entry_" . str_replace("\\", "_", $this->extends[0]->toString()) : "NULL") . ");\n"; + if ($flags !== "") { + $code .= "\tclass_entry->ce_flags |= $flags;\n"; + } + $code .= "#endif\n"; + } } else { $code .= "\tclass_entry = zend_register_internal_interface(&ce);\n"; + if ($flags !== "") { + $code .= "\tclass_entry->ce_flags |= $flags\n"; + } } } - $flagCodes = generateVersionDependentFlagCode("\tclass_entry->ce_flags |= %s;\n", $this->getFlagsByPhpVersion(), $this->phpVersionIdMinimumCompatibility); - $code .= implode("", $flagCodes); - if ($this->exposedDocComment) { if (!$php84MinimumCompatibility) { $code .= "#if (PHP_VERSION_ID >= " . PHP_84_VERSION_ID . ")\n"; diff --git a/ext/com_dotnet/com_extension_arginfo.h b/ext/com_dotnet/com_extension_arginfo.h index c75fa6df9c877..747a8b256435f 100644 --- a/ext/com_dotnet/com_extension_arginfo.h +++ b/ext/com_dotnet/com_extension_arginfo.h @@ -300,8 +300,7 @@ static zend_class_entry *register_class_variant(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "variant", class_variant_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -311,7 +310,7 @@ static zend_class_entry *register_class_com(zend_class_entry *class_entry_varian zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "com", class_com_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_variant); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_variant, 0); return class_entry; } @@ -322,7 +321,7 @@ static zend_class_entry *register_class_dotnet(zend_class_entry *class_entry_var zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "dotnet", class_dotnet_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_variant); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_variant, 0); return class_entry; } @@ -333,8 +332,7 @@ static zend_class_entry *register_class_com_safearray_proxy(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "com_safearray_proxy", class_com_safearray_proxy_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); return class_entry; } @@ -344,8 +342,7 @@ static zend_class_entry *register_class_com_exception(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "com_exception", class_com_exception_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, ZEND_ACC_FINAL); return class_entry; } diff --git a/ext/com_dotnet/com_persist_arginfo.h b/ext/com_dotnet/com_persist_arginfo.h index 6867cff30a41b..4449396e9ccef 100644 --- a/ext/com_dotnet/com_persist_arginfo.h +++ b/ext/com_dotnet/com_persist_arginfo.h @@ -56,8 +56,7 @@ static zend_class_entry *register_class_COMPersistHelper(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "COMPersistHelper", class_COMPersistHelper_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); return class_entry; } diff --git a/ext/curl/curl_arginfo.h b/ext/curl/curl_arginfo.h index 3bb825af8d146..c1cedaa6acb36 100644 --- a/ext/curl/curl_arginfo.h +++ b/ext/curl/curl_arginfo.h @@ -1099,8 +1099,7 @@ static zend_class_entry *register_class_CurlHandle(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "CurlHandle", class_CurlHandle_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -1110,8 +1109,7 @@ static zend_class_entry *register_class_CurlMultiHandle(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "CurlMultiHandle", class_CurlMultiHandle_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -1121,8 +1119,7 @@ static zend_class_entry *register_class_CurlShareHandle(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "CurlShareHandle", class_CurlShareHandle_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/curl/curl_file_arginfo.h b/ext/curl/curl_file_arginfo.h index 3f7d20466dbc9..bbf6900546a15 100644 --- a/ext/curl/curl_file_arginfo.h +++ b/ext/curl/curl_file_arginfo.h @@ -56,8 +56,7 @@ static zend_class_entry *register_class_CURLFile(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "CURLFile", class_CURLFile_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval property_name_default_value; ZVAL_EMPTY_STRING(&property_name_default_value); @@ -85,7 +84,7 @@ static zend_class_entry *register_class_CURLStringFile(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "CURLStringFile", class_CURLStringFile_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_data_default_value; ZVAL_UNDEF(&property_data_default_value); diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h index 9f7fd234dc647..8f92080015f9e 100644 --- a/ext/date/php_date_arginfo.h +++ b/ext/date/php_date_arginfo.h @@ -1011,7 +1011,7 @@ static zend_class_entry *register_class_DateTime(zend_class_entry *class_entry_D zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateTime", class_DateTime_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_DateTimeInterface); return class_entry; @@ -1022,7 +1022,7 @@ static zend_class_entry *register_class_DateTimeImmutable(zend_class_entry *clas zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateTimeImmutable", class_DateTimeImmutable_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_DateTimeInterface); return class_entry; @@ -1033,7 +1033,7 @@ static zend_class_entry *register_class_DateTimeZone(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateTimeZone", class_DateTimeZone_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval const_AFRICA_value; ZVAL_LONG(&const_AFRICA_value, PHP_DATE_TIMEZONE_GROUP_AFRICA); @@ -1127,7 +1127,7 @@ static zend_class_entry *register_class_DateInterval(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateInterval", class_DateInterval_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); return class_entry; } @@ -1137,7 +1137,7 @@ static zend_class_entry *register_class_DatePeriod(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DatePeriod", class_DatePeriod_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_IteratorAggregate); zval const_EXCLUDE_START_DATE_value; @@ -1206,8 +1206,7 @@ static zend_class_entry *register_class_DateError(zend_class_entry *class_entry_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateError", class_DateError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -1217,8 +1216,7 @@ static zend_class_entry *register_class_DateObjectError(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateObjectError", class_DateObjectError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DateError); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DateError, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -1228,8 +1226,7 @@ static zend_class_entry *register_class_DateRangeError(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateRangeError", class_DateRangeError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DateError); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DateError, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -1239,8 +1236,7 @@ static zend_class_entry *register_class_DateException(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateException", class_DateException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -1250,8 +1246,7 @@ static zend_class_entry *register_class_DateInvalidTimeZoneException(zend_class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateInvalidTimeZoneException", class_DateInvalidTimeZoneException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DateException); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DateException, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -1261,8 +1256,7 @@ static zend_class_entry *register_class_DateInvalidOperationException(zend_class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateInvalidOperationException", class_DateInvalidOperationException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DateException); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DateException, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -1272,8 +1266,7 @@ static zend_class_entry *register_class_DateMalformedStringException(zend_class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateMalformedStringException", class_DateMalformedStringException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DateException); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DateException, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -1283,8 +1276,7 @@ static zend_class_entry *register_class_DateMalformedIntervalStringException(zen zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateMalformedIntervalStringException", class_DateMalformedIntervalStringException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DateException); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DateException, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -1294,8 +1286,7 @@ static zend_class_entry *register_class_DateMalformedPeriodStringException(zend_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateMalformedPeriodStringException", class_DateMalformedPeriodStringException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DateException); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DateException, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } diff --git a/ext/dba/dba_arginfo.h b/ext/dba/dba_arginfo.h index 0d703289de1a8..15b30978fcbc9 100644 --- a/ext/dba/dba_arginfo.h +++ b/ext/dba/dba_arginfo.h @@ -114,8 +114,7 @@ static zend_class_entry *register_class_Dba_Connection(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dba", "Connection", class_Dba_Connection_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h index 08bc3ad1f645c..c87020e700942 100644 --- a/ext/dom/php_dom_arginfo.h +++ b/ext/dom/php_dom_arginfo.h @@ -2006,7 +2006,7 @@ static zend_class_entry *register_class_DOMDocumentType(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMDocumentType", class_DOMDocumentType_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); zval property_name_default_value; ZVAL_UNDEF(&property_name_default_value); @@ -2054,7 +2054,7 @@ static zend_class_entry *register_class_DOMCdataSection(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMCdataSection", class_DOMCdataSection_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMText); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMText, 0); return class_entry; } @@ -2064,7 +2064,7 @@ static zend_class_entry *register_class_DOMComment(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMComment", class_DOMComment_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMCharacterData); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMCharacterData, 0); return class_entry; } @@ -2094,7 +2094,7 @@ static zend_class_entry *register_class_DOMNode(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMNode", class_DOMNode_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval const_DOCUMENT_POSITION_DISCONNECTED_value; ZVAL_LONG(&const_DOCUMENT_POSITION_DISCONNECTED_value, 0x1); @@ -2257,7 +2257,7 @@ static zend_class_entry *register_class_DOMNameSpaceNode(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMNameSpaceNode", class_DOMNameSpaceNode_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_nodeName_default_value; ZVAL_UNDEF(&property_nodeName_default_value); @@ -2330,7 +2330,7 @@ static zend_class_entry *register_class_DOMImplementation(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMImplementation", class_DOMImplementation_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); return class_entry; } @@ -2340,7 +2340,7 @@ static zend_class_entry *register_class_DOMDocumentFragment(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMDocumentFragment", class_DOMDocumentFragment_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); zend_class_implements(class_entry, 1, class_entry_DOMParentNode); zval property_firstElementChild_default_value; @@ -2371,7 +2371,7 @@ static zend_class_entry *register_class_DOMNodeList(zend_class_entry *class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMNodeList", class_DOMNodeList_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; @@ -2388,7 +2388,7 @@ static zend_class_entry *register_class_DOMCharacterData(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMCharacterData", class_DOMCharacterData_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); zend_class_implements(class_entry, 1, class_entry_DOMChildNode); zval property_data_default_value; @@ -2425,7 +2425,7 @@ static zend_class_entry *register_class_DOMAttr(zend_class_entry *class_entry_DO zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMAttr", class_DOMAttr_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); zval property_name_default_value; ZVAL_UNDEF(&property_name_default_value); @@ -2466,7 +2466,7 @@ static zend_class_entry *register_class_DOMElement(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMElement", class_DOMElement_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); zend_class_implements(class_entry, 2, class_entry_DOMParentNode, class_entry_DOMChildNode); zval property_tagName_default_value; @@ -2535,7 +2535,7 @@ static zend_class_entry *register_class_DOMDocument(zend_class_entry *class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMDocument", class_DOMDocument_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); zend_class_implements(class_entry, 1, class_entry_DOMParentNode); zval property_doctype_default_value; @@ -2683,8 +2683,7 @@ static zend_class_entry *register_class_DOMException(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMException", class_DOMException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, ZEND_ACC_FINAL); zend_register_class_alias("Dom\\DOMException", class_entry); zval property_code_default_value; @@ -2701,7 +2700,7 @@ static zend_class_entry *register_class_DOMText(zend_class_entry *class_entry_DO zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMText", class_DOMText_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMCharacterData); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMCharacterData, 0); zval property_wholeText_default_value; ZVAL_UNDEF(&property_wholeText_default_value); @@ -2717,7 +2716,7 @@ static zend_class_entry *register_class_DOMNamedNodeMap(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMNamedNodeMap", class_DOMNamedNodeMap_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; @@ -2734,7 +2733,7 @@ static zend_class_entry *register_class_DOMEntity(zend_class_entry *class_entry_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMEntity", class_DOMEntity_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); zval property_publicId_default_value; ZVAL_UNDEF(&property_publicId_default_value); @@ -2780,7 +2779,7 @@ static zend_class_entry *register_class_DOMEntityReference(zend_class_entry *cla zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMEntityReference", class_DOMEntityReference_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); return class_entry; } @@ -2790,7 +2789,7 @@ static zend_class_entry *register_class_DOMNotation(zend_class_entry *class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMNotation", class_DOMNotation_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); zval property_publicId_default_value; ZVAL_UNDEF(&property_publicId_default_value); @@ -2812,7 +2811,7 @@ static zend_class_entry *register_class_DOMProcessingInstruction(zend_class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMProcessingInstruction", class_DOMProcessingInstruction_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DOMNode); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DOMNode, 0); zval property_target_default_value; ZVAL_UNDEF(&property_target_default_value); @@ -2835,8 +2834,7 @@ static zend_class_entry *register_class_DOMXPath(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DOMXPath", class_DOMXPath_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval property_document_default_value; ZVAL_UNDEF(&property_document_default_value); @@ -2880,8 +2878,7 @@ static zend_class_entry *register_class_Dom_Implementation(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "Implementation", class_Dom_Implementation_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -2891,8 +2888,7 @@ static zend_class_entry *register_class_Dom_Node(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "Node", class_Dom_Node_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NO_DYNAMIC_PROPERTIES); zval const_DOCUMENT_POSITION_DISCONNECTED_value; ZVAL_LONG(&const_DOCUMENT_POSITION_DISCONNECTED_value, 0x1); @@ -3030,7 +3026,7 @@ static zend_class_entry *register_class_Dom_NodeList(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "NodeList", class_Dom_NodeList_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; @@ -3047,7 +3043,7 @@ static zend_class_entry *register_class_Dom_NamedNodeMap(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "NamedNodeMap", class_Dom_NamedNodeMap_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; @@ -3064,7 +3060,7 @@ static zend_class_entry *register_class_Dom_DtdNamedNodeMap(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "DtdNamedNodeMap", class_Dom_DtdNamedNodeMap_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; @@ -3081,7 +3077,7 @@ static zend_class_entry *register_class_Dom_HTMLCollection(zend_class_entry *cla zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "HTMLCollection", class_Dom_HTMLCollection_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; @@ -3125,7 +3121,7 @@ static zend_class_entry *register_class_Dom_Element(zend_class_entry *class_entr zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "Element", class_Dom_Element_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Node); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Node, 0); zend_class_implements(class_entry, 2, class_entry_Dom_ParentNode, class_entry_Dom_ChildNode); zval property_namespaceURI_default_value; @@ -3232,7 +3228,7 @@ static zend_class_entry *register_class_Dom_HTMLElement(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "HTMLElement", class_Dom_HTMLElement_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Element); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Element, 0); return class_entry; } @@ -3242,7 +3238,7 @@ static zend_class_entry *register_class_Dom_Attr(zend_class_entry *class_entry_D zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "Attr", class_Dom_Attr_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Node); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Node, 0); zval property_namespaceURI_default_value; ZVAL_UNDEF(&property_namespaceURI_default_value); @@ -3295,7 +3291,7 @@ static zend_class_entry *register_class_Dom_CharacterData(zend_class_entry *clas zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "CharacterData", class_Dom_CharacterData_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Node); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Node, 0); zend_class_implements(class_entry, 1, class_entry_Dom_ChildNode); zval property_previousElementSibling_default_value; @@ -3332,7 +3328,7 @@ static zend_class_entry *register_class_Dom_Text(zend_class_entry *class_entry_D zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "Text", class_Dom_Text_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_CharacterData); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_CharacterData, 0); zval property_wholeText_default_value; ZVAL_UNDEF(&property_wholeText_default_value); @@ -3348,7 +3344,7 @@ static zend_class_entry *register_class_Dom_CDATASection(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "CDATASection", class_Dom_CDATASection_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Text); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Text, 0); return class_entry; } @@ -3358,7 +3354,7 @@ static zend_class_entry *register_class_Dom_ProcessingInstruction(zend_class_ent zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "ProcessingInstruction", class_Dom_ProcessingInstruction_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_CharacterData); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_CharacterData, 0); zval property_target_default_value; ZVAL_UNDEF(&property_target_default_value); @@ -3374,7 +3370,7 @@ static zend_class_entry *register_class_Dom_Comment(zend_class_entry *class_entr zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "Comment", class_Dom_Comment_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_CharacterData); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_CharacterData, 0); return class_entry; } @@ -3384,7 +3380,7 @@ static zend_class_entry *register_class_Dom_DocumentType(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "DocumentType", class_Dom_DocumentType_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Node); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Node, 0); zend_class_implements(class_entry, 1, class_entry_Dom_ChildNode); zval property_name_default_value; @@ -3433,7 +3429,7 @@ static zend_class_entry *register_class_Dom_DocumentFragment(zend_class_entry *c zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "DocumentFragment", class_Dom_DocumentFragment_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Node); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Node, 0); zend_class_implements(class_entry, 1, class_entry_Dom_ParentNode); zval property_firstElementChild_default_value; @@ -3464,7 +3460,7 @@ static zend_class_entry *register_class_Dom_Entity(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "Entity", class_Dom_Entity_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Node); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Node, 0); zval property_publicId_default_value; ZVAL_UNDEF(&property_publicId_default_value); @@ -3492,7 +3488,7 @@ static zend_class_entry *register_class_Dom_EntityReference(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "EntityReference", class_Dom_EntityReference_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Node); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Node, 0); return class_entry; } @@ -3502,7 +3498,7 @@ static zend_class_entry *register_class_Dom_Notation(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "Notation", class_Dom_Notation_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Node); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Node, 0); zval property_publicId_default_value; ZVAL_UNDEF(&property_publicId_default_value); @@ -3524,8 +3520,7 @@ static zend_class_entry *register_class_Dom_Document(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "Document", class_Dom_Document_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Node); - class_entry->ce_flags |= ZEND_ACC_ABSTRACT; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Node, ZEND_ACC_ABSTRACT); zend_class_implements(class_entry, 1, class_entry_Dom_ParentNode); zval property_implementation_default_value; @@ -3627,8 +3622,7 @@ static zend_class_entry *register_class_Dom_HTMLDocument(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "HTMLDocument", class_Dom_HTMLDocument_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Document); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Document, ZEND_ACC_FINAL); return class_entry; } @@ -3638,8 +3632,7 @@ static zend_class_entry *register_class_Dom_XMLDocument(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "XMLDocument", class_Dom_XMLDocument_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Dom_Document); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Dom_Document, ZEND_ACC_FINAL); zval property_xmlEncoding_default_value; ZVAL_UNDEF(&property_xmlEncoding_default_value); @@ -3673,8 +3666,7 @@ static zend_class_entry *register_class_Dom_TokenList(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "TokenList", class_Dom_TokenList_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 2, class_entry_Dom_IteratorAggregate, class_entry_Dom_Countable); zval property_length_default_value; @@ -3697,8 +3689,7 @@ static zend_class_entry *register_class_Dom_NamespaceInfo(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "NamespaceInfo", class_Dom_NamespaceInfo_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE|ZEND_ACC_READONLY_CLASS; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE|ZEND_ACC_READONLY_CLASS); zval property_prefix_default_value; ZVAL_UNDEF(&property_prefix_default_value); @@ -3728,8 +3719,7 @@ static zend_class_entry *register_class_Dom_XPath(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Dom", "XPath", class_Dom_XPath_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE); zval property_document_default_value; ZVAL_UNDEF(&property_document_default_value); diff --git a/ext/enchant/enchant_arginfo.h b/ext/enchant/enchant_arginfo.h index d1f0d56ddb025..cc722e18d0681 100644 --- a/ext/enchant/enchant_arginfo.h +++ b/ext/enchant/enchant_arginfo.h @@ -231,8 +231,7 @@ static zend_class_entry *register_class_EnchantBroker(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "EnchantBroker", class_EnchantBroker_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -242,8 +241,7 @@ static zend_class_entry *register_class_EnchantDictionary(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "EnchantDictionary", class_EnchantDictionary_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/ffi/ffi_arginfo.h b/ext/ffi/ffi_arginfo.h index aca7a8d25637c..56f1444bd7ab6 100644 --- a/ext/ffi/ffi_arginfo.h +++ b/ext/ffi/ffi_arginfo.h @@ -213,8 +213,7 @@ static zend_class_entry *register_class_FFI(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "FFI", class_FFI_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE); zval const___BIGGEST_ALIGNMENT___value; ZVAL_LONG(&const___BIGGEST_ALIGNMENT___value, __BIGGEST_ALIGNMENT__); @@ -230,8 +229,7 @@ static zend_class_entry *register_class_FFI_CData(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "FFI", "CData", class_FFI_CData_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -241,8 +239,7 @@ static zend_class_entry *register_class_FFI_CType(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "FFI", "CType", class_FFI_CType_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE); zval const_TYPE_VOID_value; ZVAL_LONG(&const_TYPE_VOID_value, ZEND_FFI_TYPE_VOID); @@ -482,7 +479,7 @@ static zend_class_entry *register_class_FFI_Exception(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "FFI", "Exception", class_FFI_Exception_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, 0); return class_entry; } @@ -492,8 +489,7 @@ static zend_class_entry *register_class_FFI_ParserException(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "FFI", "ParserException", class_FFI_ParserException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_FFI_Exception); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_FFI_Exception, ZEND_ACC_FINAL); return class_entry; } diff --git a/ext/fileinfo/fileinfo_arginfo.h b/ext/fileinfo/fileinfo_arginfo.h index 2ae8a2316e57b..36b9351ea1387 100644 --- a/ext/fileinfo/fileinfo_arginfo.h +++ b/ext/fileinfo/fileinfo_arginfo.h @@ -103,8 +103,7 @@ static zend_class_entry *register_class_finfo(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "finfo", class_finfo_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/ftp/ftp_arginfo.h b/ext/ftp/ftp_arginfo.h index 9aa6fcb48b352..0187ee325c615 100644 --- a/ext/ftp/ftp_arginfo.h +++ b/ext/ftp/ftp_arginfo.h @@ -300,8 +300,7 @@ static zend_class_entry *register_class_FTP_Connection(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "FTP", "Connection", class_FTP_Connection_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/gd/gd_arginfo.h b/ext/gd/gd_arginfo.h index f68b34d5e101b..6cc6da64c9bbd 100644 --- a/ext/gd/gd_arginfo.h +++ b/ext/gd/gd_arginfo.h @@ -996,8 +996,7 @@ static zend_class_entry *register_class_GdImage(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "GdImage", class_GdImage_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -1007,8 +1006,7 @@ static zend_class_entry *register_class_GdFont(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "GdFont", class_GdFont_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/gmp/gmp_arginfo.h b/ext/gmp/gmp_arginfo.h index 43d6944036888..31927d3e482bc 100644 --- a/ext/gmp/gmp_arginfo.h +++ b/ext/gmp/gmp_arginfo.h @@ -333,8 +333,7 @@ static zend_class_entry *register_class_GMP(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "GMP", class_GMP_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); return class_entry; } diff --git a/ext/hash/hash_arginfo.h b/ext/hash/hash_arginfo.h index e86ee61b656a2..92a3c40129554 100644 --- a/ext/hash/hash_arginfo.h +++ b/ext/hash/hash_arginfo.h @@ -282,8 +282,7 @@ static zend_class_entry *register_class_HashContext(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "HashContext", class_HashContext_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); return class_entry; } diff --git a/ext/intl/breakiterator/breakiterator_arginfo.h b/ext/intl/breakiterator/breakiterator_arginfo.h index 8135a9cace64d..9475f5e987fc6 100644 --- a/ext/intl/breakiterator/breakiterator_arginfo.h +++ b/ext/intl/breakiterator/breakiterator_arginfo.h @@ -156,8 +156,7 @@ static zend_class_entry *register_class_IntlBreakIterator(zend_class_entry *clas zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlBreakIterator", class_IntlBreakIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_IteratorAggregate); zval const_DONE_value; @@ -282,8 +281,7 @@ static zend_class_entry *register_class_IntlRuleBasedBreakIterator(zend_class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlRuleBasedBreakIterator", class_IntlRuleBasedBreakIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IntlBreakIterator); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IntlBreakIterator, ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -293,8 +291,7 @@ static zend_class_entry *register_class_IntlCodePointBreakIterator(zend_class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlCodePointBreakIterator", class_IntlCodePointBreakIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IntlBreakIterator); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IntlBreakIterator, ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/intl/breakiterator/breakiterator_iterators_arginfo.h b/ext/intl/breakiterator/breakiterator_iterators_arginfo.h index 4642e09c36624..f83c0accf6bf4 100644 --- a/ext/intl/breakiterator/breakiterator_iterators_arginfo.h +++ b/ext/intl/breakiterator/breakiterator_iterators_arginfo.h @@ -21,8 +21,7 @@ static zend_class_entry *register_class_IntlPartsIterator(zend_class_entry *clas zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlPartsIterator", class_IntlPartsIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IntlIterator); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IntlIterator, ZEND_ACC_NOT_SERIALIZABLE); zval const_KEY_SEQUENTIAL_value; ZVAL_LONG(&const_KEY_SEQUENTIAL_value, PARTS_ITERATOR_KEY_SEQUENTIAL); diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h index 44c5cc16b21c0..9e050539b2e87 100644 --- a/ext/intl/calendar/calendar_arginfo.h +++ b/ext/intl/calendar/calendar_arginfo.h @@ -325,8 +325,7 @@ static zend_class_entry *register_class_IntlCalendar(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlCalendar", class_IntlCalendar_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_FIELD_ERA_value; ZVAL_LONG(&const_FIELD_ERA_value, UCAL_ERA); @@ -570,8 +569,7 @@ static zend_class_entry *register_class_IntlGregorianCalendar(zend_class_entry * zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlGregorianCalendar", class_IntlGregorianCalendar_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IntlCalendar); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IntlCalendar, ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/intl/collator/collator_arginfo.h b/ext/intl/collator/collator_arginfo.h index 451d23eb0a238..3f469b02facd4 100644 --- a/ext/intl/collator/collator_arginfo.h +++ b/ext/intl/collator/collator_arginfo.h @@ -99,8 +99,7 @@ static zend_class_entry *register_class_Collator(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Collator", class_Collator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_DEFAULT_VALUE_value; ZVAL_LONG(&const_DEFAULT_VALUE_value, UCOL_DEFAULT); diff --git a/ext/intl/common/common_arginfo.h b/ext/intl/common/common_arginfo.h index dcdf8434b4e70..c5e023ecb8883 100644 --- a/ext/intl/common/common_arginfo.h +++ b/ext/intl/common/common_arginfo.h @@ -179,8 +179,7 @@ static zend_class_entry *register_class_IntlIterator(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlIterator", class_IntlIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Iterator); return class_entry; diff --git a/ext/intl/converter/converter_arginfo.h b/ext/intl/converter/converter_arginfo.h index 92c00af50ba95..4e02daf9478ad 100644 --- a/ext/intl/converter/converter_arginfo.h +++ b/ext/intl/converter/converter_arginfo.h @@ -122,8 +122,7 @@ static zend_class_entry *register_class_UConverter(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "UConverter", class_UConverter_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_REASON_UNASSIGNED_value; ZVAL_LONG(&const_REASON_UNASSIGNED_value, UCNV_UNASSIGNED); diff --git a/ext/intl/dateformat/dateformat_arginfo.h b/ext/intl/dateformat/dateformat_arginfo.h index df1de7d6895f4..b57cb79468f2b 100644 --- a/ext/intl/dateformat/dateformat_arginfo.h +++ b/ext/intl/dateformat/dateformat_arginfo.h @@ -145,8 +145,7 @@ static zend_class_entry *register_class_IntlDateFormatter(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlDateFormatter", class_IntlDateFormatter_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_FULL_value; ZVAL_LONG(&const_FULL_value, UDAT_FULL); diff --git a/ext/intl/dateformat/datepatterngenerator_arginfo.h b/ext/intl/dateformat/datepatterngenerator_arginfo.h index fd00ab845df62..14327b0d69f88 100644 --- a/ext/intl/dateformat/datepatterngenerator_arginfo.h +++ b/ext/intl/dateformat/datepatterngenerator_arginfo.h @@ -29,8 +29,7 @@ static zend_class_entry *register_class_IntlDatePatternGenerator(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlDatePatternGenerator", class_IntlDatePatternGenerator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/intl/formatter/formatter_arginfo.h b/ext/intl/formatter/formatter_arginfo.h index 0f067ee73c697..9b2874da05ac6 100644 --- a/ext/intl/formatter/formatter_arginfo.h +++ b/ext/intl/formatter/formatter_arginfo.h @@ -123,8 +123,7 @@ static zend_class_entry *register_class_NumberFormatter(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "NumberFormatter", class_NumberFormatter_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_PATTERN_DECIMAL_value; ZVAL_LONG(&const_PATTERN_DECIMAL_value, UNUM_PATTERN_DECIMAL); diff --git a/ext/intl/locale/locale_arginfo.h b/ext/intl/locale/locale_arginfo.h index b03c552225298..7bba882d20457 100644 --- a/ext/intl/locale/locale_arginfo.h +++ b/ext/intl/locale/locale_arginfo.h @@ -108,7 +108,7 @@ static zend_class_entry *register_class_Locale(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Locale", class_Locale_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval const_ACTUAL_LOCALE_value; ZVAL_LONG(&const_ACTUAL_LOCALE_value, ULOC_ACTUAL_LOCALE); diff --git a/ext/intl/msgformat/msgformat_arginfo.h b/ext/intl/msgformat/msgformat_arginfo.h index bc45b5b535de5..74353fbf93ae2 100644 --- a/ext/intl/msgformat/msgformat_arginfo.h +++ b/ext/intl/msgformat/msgformat_arginfo.h @@ -78,8 +78,7 @@ static zend_class_entry *register_class_MessageFormatter(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "MessageFormatter", class_MessageFormatter_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/intl/normalizer/normalizer_arginfo.h b/ext/intl/normalizer/normalizer_arginfo.h index a7a870a60d55e..5b8d80e3573f8 100644 --- a/ext/intl/normalizer/normalizer_arginfo.h +++ b/ext/intl/normalizer/normalizer_arginfo.h @@ -38,7 +38,7 @@ static zend_class_entry *register_class_Normalizer(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Normalizer", class_Normalizer_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval const_FORM_D_value; ZVAL_LONG(&const_FORM_D_value, NORMALIZER_FORM_D); diff --git a/ext/intl/php_intl_arginfo.h b/ext/intl/php_intl_arginfo.h index 702412125e594..a4fa30644258c 100644 --- a/ext/intl/php_intl_arginfo.h +++ b/ext/intl/php_intl_arginfo.h @@ -1250,7 +1250,7 @@ static zend_class_entry *register_class_IntlException(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlException", class_IntlException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); return class_entry; } diff --git a/ext/intl/resourcebundle/resourcebundle_arginfo.h b/ext/intl/resourcebundle/resourcebundle_arginfo.h index bfbb3511e62bc..f52de6314aa5d 100644 --- a/ext/intl/resourcebundle/resourcebundle_arginfo.h +++ b/ext/intl/resourcebundle/resourcebundle_arginfo.h @@ -59,8 +59,7 @@ static zend_class_entry *register_class_ResourceBundle(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ResourceBundle", class_ResourceBundle_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); return class_entry; diff --git a/ext/intl/spoofchecker/spoofchecker_arginfo.h b/ext/intl/spoofchecker/spoofchecker_arginfo.h index d0ba891ea958e..cee17335dcd40 100644 --- a/ext/intl/spoofchecker/spoofchecker_arginfo.h +++ b/ext/intl/spoofchecker/spoofchecker_arginfo.h @@ -62,8 +62,7 @@ static zend_class_entry *register_class_Spoofchecker(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Spoofchecker", class_Spoofchecker_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_SINGLE_SCRIPT_CONFUSABLE_value; ZVAL_LONG(&const_SINGLE_SCRIPT_CONFUSABLE_value, USPOOF_SINGLE_SCRIPT_CONFUSABLE); diff --git a/ext/intl/timezone/timezone_arginfo.h b/ext/intl/timezone/timezone_arginfo.h index 023346526a00e..b26e594cf930f 100644 --- a/ext/intl/timezone/timezone_arginfo.h +++ b/ext/intl/timezone/timezone_arginfo.h @@ -178,8 +178,7 @@ static zend_class_entry *register_class_IntlTimeZone(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlTimeZone", class_IntlTimeZone_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_DISPLAY_SHORT_value; ZVAL_LONG(&const_DISPLAY_SHORT_value, TimeZone::SHORT); diff --git a/ext/intl/transliterator/transliterator_arginfo.h b/ext/intl/transliterator/transliterator_arginfo.h index ee39917117172..0a53fe9a6b9c4 100644 --- a/ext/intl/transliterator/transliterator_arginfo.h +++ b/ext/intl/transliterator/transliterator_arginfo.h @@ -58,8 +58,7 @@ static zend_class_entry *register_class_Transliterator(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Transliterator", class_Transliterator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_FORWARD_value; ZVAL_LONG(&const_FORWARD_value, TRANSLITERATOR_FORWARD); diff --git a/ext/intl/uchar/uchar_arginfo.h b/ext/intl/uchar/uchar_arginfo.h index d6217c7f8f8dc..ea70f17658867 100644 --- a/ext/intl/uchar/uchar_arginfo.h +++ b/ext/intl/uchar/uchar_arginfo.h @@ -314,7 +314,7 @@ static zend_class_entry *register_class_IntlChar(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IntlChar", class_IntlChar_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval const_UNICODE_VERSION_value; zend_string *const_UNICODE_VERSION_value_str = zend_string_init(U_UNICODE_VERSION, strlen(U_UNICODE_VERSION), 1); diff --git a/ext/json/json_arginfo.h b/ext/json/json_arginfo.h index a02cfd4a78105..e81a78d2b712b 100644 --- a/ext/json/json_arginfo.h +++ b/ext/json/json_arginfo.h @@ -101,7 +101,7 @@ static zend_class_entry *register_class_JsonException(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "JsonException", class_JsonException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); return class_entry; } diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index 369909889be90..0e5409ef53025 100644 --- a/ext/ldap/ldap_arginfo.h +++ b/ext/ldap/ldap_arginfo.h @@ -892,8 +892,7 @@ static zend_class_entry *register_class_LDAP_Connection(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "LDAP", "Connection", class_LDAP_Connection_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -903,8 +902,7 @@ static zend_class_entry *register_class_LDAP_Result(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "LDAP", "Result", class_LDAP_Result_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -914,8 +912,7 @@ static zend_class_entry *register_class_LDAP_ResultEntry(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "LDAP", "ResultEntry", class_LDAP_ResultEntry_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/libxml/libxml_arginfo.h b/ext/libxml/libxml_arginfo.h index 90db5d10d4e06..816d780173c17 100644 --- a/ext/libxml/libxml_arginfo.h +++ b/ext/libxml/libxml_arginfo.h @@ -109,7 +109,7 @@ static zend_class_entry *register_class_LibXMLError(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "LibXMLError", class_LibXMLError_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_level_default_value; ZVAL_UNDEF(&property_level_default_value); diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h index 6e347bafcc417..0d6ab88a280c5 100644 --- a/ext/mysqli/mysqli_arginfo.h +++ b/ext/mysqli/mysqli_arginfo.h @@ -1215,8 +1215,7 @@ static zend_class_entry *register_class_mysqli_driver(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "mysqli_driver", class_mysqli_driver_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zval property_client_info_default_value; ZVAL_UNDEF(&property_client_info_default_value); @@ -1250,7 +1249,7 @@ static zend_class_entry *register_class_mysqli(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "mysqli", class_mysqli_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_affected_rows_default_value; ZVAL_UNDEF(&property_affected_rows_default_value); @@ -1437,7 +1436,7 @@ static zend_class_entry *register_class_mysqli_result(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "mysqli_result", class_mysqli_result_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_IteratorAggregate); zval property_current_field_default_value; @@ -1478,7 +1477,7 @@ static zend_class_entry *register_class_mysqli_stmt(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "mysqli_stmt", class_mysqli_stmt_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_affected_rows_default_value; ZVAL_UNDEF(&property_affected_rows_default_value); @@ -1548,8 +1547,7 @@ static zend_class_entry *register_class_mysqli_warning(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "mysqli_warning", class_mysqli_warning_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zval property_message_default_value; ZVAL_UNDEF(&property_message_default_value); @@ -1577,8 +1575,7 @@ static zend_class_entry *register_class_mysqli_sql_exception(zend_class_entry *c zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "mysqli_sql_exception", class_mysqli_sql_exception_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RuntimeException); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RuntimeException, ZEND_ACC_FINAL); zval property_sqlstate_default_value; zend_string *property_sqlstate_default_value_str = zend_string_init("00000", strlen("00000"), 1); diff --git a/ext/odbc/odbc_arginfo.h b/ext/odbc/odbc_arginfo.h index f3480033a0918..4bed0ccb7e6c8 100644 --- a/ext/odbc/odbc_arginfo.h +++ b/ext/odbc/odbc_arginfo.h @@ -510,8 +510,7 @@ static zend_class_entry *register_class_Odbc_Connection(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Odbc", "Connection", class_Odbc_Connection_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -521,8 +520,7 @@ static zend_class_entry *register_class_Odbc_Result(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Odbc", "Result", class_Odbc_Result_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/openssl/openssl_arginfo.h b/ext/openssl/openssl_arginfo.h index 45a0593cf966e..e634f92f73d00 100644 --- a/ext/openssl/openssl_arginfo.h +++ b/ext/openssl/openssl_arginfo.h @@ -766,8 +766,7 @@ static zend_class_entry *register_class_OpenSSLCertificate(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "OpenSSLCertificate", class_OpenSSLCertificate_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -777,8 +776,7 @@ static zend_class_entry *register_class_OpenSSLCertificateSigningRequest(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "OpenSSLCertificateSigningRequest", class_OpenSSLCertificateSigningRequest_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -788,8 +786,7 @@ static zend_class_entry *register_class_OpenSSLAsymmetricKey(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "OpenSSLAsymmetricKey", class_OpenSSLAsymmetricKey_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/pdo/pdo_arginfo.h b/ext/pdo/pdo_arginfo.h index e6beb57bd23e5..eb42a1c9d0d73 100644 --- a/ext/pdo/pdo_arginfo.h +++ b/ext/pdo/pdo_arginfo.h @@ -20,7 +20,7 @@ static zend_class_entry *register_class_PDOException(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "PDOException", class_PDOException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RuntimeException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RuntimeException, 0); zval property_code_default_value; ZVAL_LONG(&property_code_default_value, 0); diff --git a/ext/pdo/pdo_dbh_arginfo.h b/ext/pdo/pdo_dbh_arginfo.h index ecb21b3e4d917..71df4c519e1a7 100644 --- a/ext/pdo/pdo_dbh_arginfo.h +++ b/ext/pdo/pdo_dbh_arginfo.h @@ -107,8 +107,7 @@ static zend_class_entry *register_class_PDO(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "PDO", class_PDO_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_PARAM_NULL_value; ZVAL_LONG(&const_PARAM_NULL_value, LONG_CONST(PDO_PARAM_NULL)); diff --git a/ext/pdo/pdo_stmt_arginfo.h b/ext/pdo/pdo_stmt_arginfo.h index d0d90899125f4..4d8c1fa4715e4 100644 --- a/ext/pdo/pdo_stmt_arginfo.h +++ b/ext/pdo/pdo_stmt_arginfo.h @@ -141,8 +141,7 @@ static zend_class_entry *register_class_PDOStatement(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "PDOStatement", class_PDOStatement_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_IteratorAggregate); zval property_queryString_default_value; @@ -159,8 +158,7 @@ static zend_class_entry *register_class_PDORow(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "PDORow", class_PDORow_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE); zval property_queryString_default_value; ZVAL_UNDEF(&property_queryString_default_value); diff --git a/ext/pdo_dblib/pdo_dblib_arginfo.h b/ext/pdo_dblib/pdo_dblib_arginfo.h index 3c9e306f3042c..a5105e3da6443 100644 --- a/ext/pdo_dblib/pdo_dblib_arginfo.h +++ b/ext/pdo_dblib/pdo_dblib_arginfo.h @@ -10,8 +10,7 @@ static zend_class_entry *register_class_Pdo_Dblib(zend_class_entry *class_entry_ zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Pdo", "Dblib", class_Pdo_Dblib_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_PDO); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_PDO, ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zval const_ATTR_CONNECTION_TIMEOUT_value; ZVAL_LONG(&const_ATTR_CONNECTION_TIMEOUT_value, PDO_DBLIB_ATTR_CONNECTION_TIMEOUT); diff --git a/ext/pdo_firebird/pdo_firebird_arginfo.h b/ext/pdo_firebird/pdo_firebird_arginfo.h index a751751edb635..a5a9c562c9c12 100644 --- a/ext/pdo_firebird/pdo_firebird_arginfo.h +++ b/ext/pdo_firebird/pdo_firebird_arginfo.h @@ -16,8 +16,7 @@ static zend_class_entry *register_class_Pdo_Firebird(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Pdo", "Firebird", class_Pdo_Firebird_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_PDO); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_PDO, ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zval const_ATTR_DATE_FORMAT_value; ZVAL_LONG(&const_ATTR_DATE_FORMAT_value, PDO_FB_ATTR_DATE_FORMAT); diff --git a/ext/pdo_mysql/pdo_mysql_arginfo.h b/ext/pdo_mysql/pdo_mysql_arginfo.h index 1ae005d849103..1e6fd32751fe5 100644 --- a/ext/pdo_mysql/pdo_mysql_arginfo.h +++ b/ext/pdo_mysql/pdo_mysql_arginfo.h @@ -16,8 +16,7 @@ static zend_class_entry *register_class_Pdo_Mysql(zend_class_entry *class_entry_ zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Pdo", "Mysql", class_Pdo_Mysql_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_PDO); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_PDO, ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zval const_ATTR_USE_BUFFERED_QUERY_value; ZVAL_LONG(&const_ATTR_USE_BUFFERED_QUERY_value, PDO_MYSQL_ATTR_USE_BUFFERED_QUERY); diff --git a/ext/pdo_odbc/pdo_odbc_arginfo.h b/ext/pdo_odbc/pdo_odbc_arginfo.h index b74ed6f2917a6..2f281e6922f5b 100644 --- a/ext/pdo_odbc/pdo_odbc_arginfo.h +++ b/ext/pdo_odbc/pdo_odbc_arginfo.h @@ -15,8 +15,7 @@ static zend_class_entry *register_class_Pdo_Odbc(zend_class_entry *class_entry_P zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Pdo", "Odbc", class_Pdo_Odbc_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_PDO); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_PDO, ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zval const_ATTR_USE_CURSOR_LIBRARY_value; ZVAL_LONG(&const_ATTR_USE_CURSOR_LIBRARY_value, PDO_ODBC_ATTR_USE_CURSOR_LIBRARY); diff --git a/ext/pdo_pgsql/pdo_pgsql_arginfo.h b/ext/pdo_pgsql/pdo_pgsql_arginfo.h index 4f70e79f8d5d4..f7f54cb600c72 100644 --- a/ext/pdo_pgsql/pdo_pgsql_arginfo.h +++ b/ext/pdo_pgsql/pdo_pgsql_arginfo.h @@ -86,8 +86,7 @@ static zend_class_entry *register_class_Pdo_Pgsql(zend_class_entry *class_entry_ zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Pdo", "Pgsql", class_Pdo_Pgsql_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_PDO); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_PDO, ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zval const_ATTR_DISABLE_PREPARES_value; ZVAL_LONG(&const_ATTR_DISABLE_PREPARES_value, PDO_PGSQL_ATTR_DISABLE_PREPARES); diff --git a/ext/pdo_sqlite/pdo_sqlite_arginfo.h b/ext/pdo_sqlite/pdo_sqlite_arginfo.h index d0c006ac2d989..4abbc0bb625c6 100644 --- a/ext/pdo_sqlite/pdo_sqlite_arginfo.h +++ b/ext/pdo_sqlite/pdo_sqlite_arginfo.h @@ -58,8 +58,7 @@ static zend_class_entry *register_class_Pdo_Sqlite(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Pdo", "Sqlite", class_Pdo_Sqlite_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_PDO); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_PDO, ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); #if defined(SQLITE_DETERMINISTIC) zval const_DETERMINISTIC_value; diff --git a/ext/pgsql/pgsql_arginfo.h b/ext/pgsql/pgsql_arginfo.h index a164584eb3add..85ca35b6a5a10 100644 --- a/ext/pgsql/pgsql_arginfo.h +++ b/ext/pgsql/pgsql_arginfo.h @@ -1147,8 +1147,7 @@ static zend_class_entry *register_class_PgSql_Connection(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "PgSql", "Connection", class_PgSql_Connection_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -1158,8 +1157,7 @@ static zend_class_entry *register_class_PgSql_Result(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "PgSql", "Result", class_PgSql_Result_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -1169,8 +1167,7 @@ static zend_class_entry *register_class_PgSql_Lob(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "PgSql", "Lob", class_PgSql_Lob_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/phar/phar_object_arginfo.h b/ext/phar/phar_object_arginfo.h index 16482611560b7..5d4e07257f61e 100644 --- a/ext/phar/phar_object_arginfo.h +++ b/ext/phar/phar_object_arginfo.h @@ -608,7 +608,7 @@ static zend_class_entry *register_class_PharException(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "PharException", class_PharException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); return class_entry; } @@ -618,7 +618,7 @@ static zend_class_entry *register_class_Phar(zend_class_entry *class_entry_Recur zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Phar", class_Phar_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RecursiveDirectoryIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RecursiveDirectoryIterator, 0); zend_class_implements(class_entry, 2, class_entry_Countable, class_entry_ArrayAccess); zval const_BZ2_value; @@ -725,7 +725,7 @@ static zend_class_entry *register_class_PharData(zend_class_entry *class_entry_R zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "PharData", class_PharData_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RecursiveDirectoryIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RecursiveDirectoryIterator, 0); zend_class_implements(class_entry, 2, class_entry_Countable, class_entry_ArrayAccess); return class_entry; @@ -736,7 +736,7 @@ static zend_class_entry *register_class_PharFileInfo(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "PharFileInfo", class_PharFileInfo_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_SplFileInfo); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_SplFileInfo, 0); return class_entry; } diff --git a/ext/random/random_arginfo.h b/ext/random/random_arginfo.h index fcb96380c6f0e..7f684271f7bab 100644 --- a/ext/random/random_arginfo.h +++ b/ext/random/random_arginfo.h @@ -267,8 +267,7 @@ static zend_class_entry *register_class_Random_Engine_Mt19937(zend_class_entry * zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Random\\Engine", "Mt19937", class_Random_Engine_Mt19937_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES); zend_class_implements(class_entry, 1, class_entry_Random_Engine); return class_entry; @@ -279,8 +278,7 @@ static zend_class_entry *register_class_Random_Engine_PcgOneseq128XslRr64(zend_c zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Random\\Engine", "PcgOneseq128XslRr64", class_Random_Engine_PcgOneseq128XslRr64_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES); zend_class_implements(class_entry, 1, class_entry_Random_Engine); return class_entry; @@ -291,8 +289,7 @@ static zend_class_entry *register_class_Random_Engine_Xoshiro256StarStar(zend_cl zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Random\\Engine", "Xoshiro256StarStar", class_Random_Engine_Xoshiro256StarStar_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES); zend_class_implements(class_entry, 1, class_entry_Random_Engine); return class_entry; @@ -303,8 +300,7 @@ static zend_class_entry *register_class_Random_Engine_Secure(zend_class_entry *c zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Random\\Engine", "Secure", class_Random_Engine_Secure_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Random_CryptoSafeEngine); return class_entry; @@ -336,8 +332,7 @@ static zend_class_entry *register_class_Random_Randomizer(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Random", "Randomizer", class_Random_Randomizer_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES); zval property_engine_default_value; ZVAL_UNDEF(&property_engine_default_value); @@ -369,8 +364,7 @@ static zend_class_entry *register_class_Random_RandomError(zend_class_entry *cla zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Random", "RandomError", class_Random_RandomError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -380,8 +374,7 @@ static zend_class_entry *register_class_Random_BrokenRandomEngineError(zend_clas zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Random", "BrokenRandomEngineError", class_Random_BrokenRandomEngineError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Random_RandomError); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Random_RandomError, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -391,8 +384,7 @@ static zend_class_entry *register_class_Random_RandomException(zend_class_entry zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Random", "RandomException", class_Random_RandomException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } diff --git a/ext/reflection/php_reflection_arginfo.h b/ext/reflection/php_reflection_arginfo.h index a35bdd766ef7b..2f0a513044c5d 100644 --- a/ext/reflection/php_reflection_arginfo.h +++ b/ext/reflection/php_reflection_arginfo.h @@ -1269,7 +1269,7 @@ static zend_class_entry *register_class_ReflectionException(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionException", class_ReflectionException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); return class_entry; } @@ -1279,7 +1279,7 @@ static zend_class_entry *register_class_Reflection(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Reflection", class_Reflection_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); return class_entry; } @@ -1300,8 +1300,7 @@ static zend_class_entry *register_class_ReflectionFunctionAbstract(zend_class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionFunctionAbstract", class_ReflectionFunctionAbstract_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_ABSTRACT|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_ABSTRACT|ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Reflector); zval property_name_default_value; @@ -1318,7 +1317,7 @@ static zend_class_entry *register_class_ReflectionFunction(zend_class_entry *cla zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionFunction", class_ReflectionFunction_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionFunctionAbstract); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ReflectionFunctionAbstract, 0); zval const_IS_DEPRECATED_value; ZVAL_LONG(&const_IS_DEPRECATED_value, ZEND_ACC_DEPRECATED); @@ -1347,8 +1346,7 @@ static zend_class_entry *register_class_ReflectionGenerator(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionGenerator", class_ReflectionGenerator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -1358,7 +1356,7 @@ static zend_class_entry *register_class_ReflectionMethod(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionMethod", class_ReflectionMethod_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionFunctionAbstract); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ReflectionFunctionAbstract, 0); zval const_IS_STATIC_value; ZVAL_LONG(&const_IS_STATIC_value, ZEND_ACC_STATIC); @@ -1410,8 +1408,7 @@ static zend_class_entry *register_class_ReflectionClass(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionClass", class_ReflectionClass_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Reflector); zval const_IS_IMPLICIT_ABSTRACT_value; @@ -1452,7 +1449,7 @@ static zend_class_entry *register_class_ReflectionObject(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionObject", class_ReflectionObject_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionClass); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ReflectionClass, 0); return class_entry; } @@ -1479,8 +1476,7 @@ static zend_class_entry *register_class_ReflectionProperty(zend_class_entry *cla zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionProperty", class_ReflectionProperty_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Reflector); zval const_IS_STATIC_value; @@ -1539,8 +1535,7 @@ static zend_class_entry *register_class_ReflectionClassConstant(zend_class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionClassConstant", class_ReflectionClassConstant_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Reflector); zval const_IS_PUBLIC_value; @@ -1587,8 +1582,7 @@ static zend_class_entry *register_class_ReflectionParameter(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionParameter", class_ReflectionParameter_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Reflector); zval property_name_default_value; @@ -1642,8 +1636,7 @@ static zend_class_entry *register_class_ReflectionType(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionType", class_ReflectionType_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_ABSTRACT|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_ABSTRACT|ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Stringable); return class_entry; @@ -1654,7 +1647,7 @@ static zend_class_entry *register_class_ReflectionNamedType(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionNamedType", class_ReflectionNamedType_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionType); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ReflectionType, 0); return class_entry; } @@ -1664,7 +1657,7 @@ static zend_class_entry *register_class_ReflectionUnionType(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionUnionType", class_ReflectionUnionType_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionType); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ReflectionType, 0); return class_entry; } @@ -1674,7 +1667,7 @@ static zend_class_entry *register_class_ReflectionIntersectionType(zend_class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionIntersectionType", class_ReflectionIntersectionType_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionType); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ReflectionType, 0); return class_entry; } @@ -1684,8 +1677,7 @@ static zend_class_entry *register_class_ReflectionExtension(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionExtension", class_ReflectionExtension_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Reflector); zval property_name_default_value; @@ -1702,8 +1694,7 @@ static zend_class_entry *register_class_ReflectionZendExtension(zend_class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionZendExtension", class_ReflectionZendExtension_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Reflector); zval property_name_default_value; @@ -1720,8 +1711,7 @@ static zend_class_entry *register_class_ReflectionReference(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionReference", class_ReflectionReference_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -1731,8 +1721,7 @@ static zend_class_entry *register_class_ReflectionAttribute(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionAttribute", class_ReflectionAttribute_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Reflector); zval const_IS_INSTANCEOF_value; @@ -1755,7 +1744,7 @@ static zend_class_entry *register_class_ReflectionEnum(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionEnum", class_ReflectionEnum_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionClass); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ReflectionClass, 0); return class_entry; } @@ -1765,7 +1754,7 @@ static zend_class_entry *register_class_ReflectionEnumUnitCase(zend_class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionEnumUnitCase", class_ReflectionEnumUnitCase_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionClassConstant); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ReflectionClassConstant, 0); return class_entry; } @@ -1775,7 +1764,7 @@ static zend_class_entry *register_class_ReflectionEnumBackedCase(zend_class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionEnumBackedCase", class_ReflectionEnumBackedCase_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ReflectionEnumUnitCase); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ReflectionEnumUnitCase, 0); return class_entry; } @@ -1785,8 +1774,7 @@ static zend_class_entry *register_class_ReflectionFiber(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionFiber", class_ReflectionFiber_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -1796,8 +1784,7 @@ static zend_class_entry *register_class_ReflectionConstant(zend_class_entry *cla zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ReflectionConstant", class_ReflectionConstant_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Reflector); zval property_name_default_value; diff --git a/ext/session/session_arginfo.h b/ext/session/session_arginfo.h index a1fe34cfde3e8..3e0c889ae3c55 100644 --- a/ext/session/session_arginfo.h +++ b/ext/session/session_arginfo.h @@ -266,7 +266,7 @@ static zend_class_entry *register_class_SessionHandler(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SessionHandler", class_SessionHandler_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 2, class_entry_SessionHandlerInterface, class_entry_SessionIdInterface); return class_entry; diff --git a/ext/shmop/shmop_arginfo.h b/ext/shmop/shmop_arginfo.h index 455d326fa3a72..79eaee3283379 100644 --- a/ext/shmop/shmop_arginfo.h +++ b/ext/shmop/shmop_arginfo.h @@ -74,8 +74,7 @@ static zend_class_entry *register_class_Shmop(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Shmop", class_Shmop_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/simplexml/simplexml_arginfo.h b/ext/simplexml/simplexml_arginfo.h index 285df20813f07..1048fe443017a 100644 --- a/ext/simplexml/simplexml_arginfo.h +++ b/ext/simplexml/simplexml_arginfo.h @@ -165,8 +165,7 @@ static zend_class_entry *register_class_SimpleXMLElement(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SimpleXMLElement", class_SimpleXMLElement_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 3, class_entry_Stringable, class_entry_Countable, class_entry_RecursiveIterator); return class_entry; @@ -177,7 +176,7 @@ static zend_class_entry *register_class_SimpleXMLIterator(zend_class_entry *clas zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SimpleXMLIterator", class_SimpleXMLIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_SimpleXMLElement); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_SimpleXMLElement, 0); return class_entry; } diff --git a/ext/snmp/snmp_arginfo.h b/ext/snmp/snmp_arginfo.h index 307c22ecb8d8e..97046c88b61c2 100644 --- a/ext/snmp/snmp_arginfo.h +++ b/ext/snmp/snmp_arginfo.h @@ -270,7 +270,7 @@ static zend_class_entry *register_class_SNMP(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SNMP", class_SNMP_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval const_VERSION_1_value; ZVAL_LONG(&const_VERSION_1_value, SNMP_VERSION_1); @@ -400,7 +400,7 @@ static zend_class_entry *register_class_SNMPException(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SNMPException", class_SNMPException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RuntimeException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RuntimeException, 0); return class_entry; } diff --git a/ext/soap/soap_arginfo.h b/ext/soap/soap_arginfo.h index 63e5a01910c48..23af99aa3946c 100644 --- a/ext/soap/soap_arginfo.h +++ b/ext/soap/soap_arginfo.h @@ -323,8 +323,7 @@ static zend_class_entry *register_class_Soap_Url(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Soap", "Url", class_Soap_Url_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -334,8 +333,7 @@ static zend_class_entry *register_class_Soap_Sdl(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "Soap", "Sdl", class_Soap_Sdl_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -345,7 +343,7 @@ static zend_class_entry *register_class_SoapParam(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SoapParam", class_SoapParam_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_param_name_default_value; ZVAL_UNDEF(&property_param_name_default_value); @@ -367,7 +365,7 @@ static zend_class_entry *register_class_SoapHeader(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SoapHeader", class_SoapHeader_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_namespace_default_value; ZVAL_UNDEF(&property_namespace_default_value); @@ -407,7 +405,7 @@ static zend_class_entry *register_class_SoapFault(zend_class_entry *class_entry_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SoapFault", class_SoapFault_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); zval property_faultstring_default_value; ZVAL_UNDEF(&property_faultstring_default_value); @@ -459,7 +457,7 @@ static zend_class_entry *register_class_SoapVar(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SoapVar", class_SoapVar_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_enc_type_default_value; ZVAL_UNDEF(&property_enc_type_default_value); @@ -505,7 +503,7 @@ static zend_class_entry *register_class_SoapServer(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SoapServer", class_SoapServer_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property___soap_fault_default_value; ZVAL_NULL(&property___soap_fault_default_value); @@ -522,7 +520,7 @@ static zend_class_entry *register_class_SoapClient(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SoapClient", class_SoapClient_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_uri_default_value; ZVAL_NULL(&property_uri_default_value); diff --git a/ext/sockets/sockets_arginfo.h b/ext/sockets/sockets_arginfo.h index a8dc7adaa8574..9cc21fbd24ce4 100644 --- a/ext/sockets/sockets_arginfo.h +++ b/ext/sockets/sockets_arginfo.h @@ -1087,8 +1087,7 @@ static zend_class_entry *register_class_Socket(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Socket", class_Socket_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -1098,8 +1097,7 @@ static zend_class_entry *register_class_AddressInfo(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "AddressInfo", class_AddressInfo_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/sodium/libsodium_arginfo.h b/ext/sodium/libsodium_arginfo.h index ebc5fadae6452..f1f0ce58ef81c 100644 --- a/ext/sodium/libsodium_arginfo.h +++ b/ext/sodium/libsodium_arginfo.h @@ -1383,7 +1383,7 @@ static zend_class_entry *register_class_SodiumException(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SodiumException", class_SodiumException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); return class_entry; } diff --git a/ext/spl/spl_array_arginfo.h b/ext/spl/spl_array_arginfo.h index e846943c3cbfe..24dcadac661c8 100644 --- a/ext/spl/spl_array_arginfo.h +++ b/ext/spl/spl_array_arginfo.h @@ -259,7 +259,7 @@ static zend_class_entry *register_class_ArrayObject(zend_class_entry *class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ArrayObject", class_ArrayObject_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 4, class_entry_IteratorAggregate, class_entry_ArrayAccess, class_entry_Serializable, class_entry_Countable); zval const_STD_PROP_LIST_value; @@ -282,7 +282,7 @@ static zend_class_entry *register_class_ArrayIterator(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ArrayIterator", class_ArrayIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 4, class_entry_SeekableIterator, class_entry_ArrayAccess, class_entry_Serializable, class_entry_Countable); zval const_STD_PROP_LIST_value; @@ -305,7 +305,7 @@ static zend_class_entry *register_class_RecursiveArrayIterator(zend_class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RecursiveArrayIterator", class_RecursiveArrayIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_ArrayIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ArrayIterator, 0); zend_class_implements(class_entry, 1, class_entry_RecursiveIterator); zval const_CHILD_ARRAYS_ONLY_value; diff --git a/ext/spl/spl_directory_arginfo.h b/ext/spl/spl_directory_arginfo.h index 4534970dc492c..b8d197aa941b8 100644 --- a/ext/spl/spl_directory_arginfo.h +++ b/ext/spl/spl_directory_arginfo.h @@ -487,8 +487,7 @@ static zend_class_entry *register_class_SplFileInfo(zend_class_entry *class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplFileInfo", class_SplFileInfo_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zend_class_implements(class_entry, 1, class_entry_Stringable); @@ -507,7 +506,7 @@ static zend_class_entry *register_class_DirectoryIterator(zend_class_entry *clas zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DirectoryIterator", class_DirectoryIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_SplFileInfo); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_SplFileInfo, 0); zend_class_implements(class_entry, 1, class_entry_SeekableIterator); return class_entry; @@ -518,7 +517,7 @@ static zend_class_entry *register_class_FilesystemIterator(zend_class_entry *cla zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "FilesystemIterator", class_FilesystemIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_DirectoryIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_DirectoryIterator, 0); zval const_CURRENT_MODE_MASK_value; ZVAL_LONG(&const_CURRENT_MODE_MASK_value, SPL_FILE_DIR_CURRENT_MODE_MASK); @@ -600,7 +599,7 @@ static zend_class_entry *register_class_RecursiveDirectoryIterator(zend_class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RecursiveDirectoryIterator", class_RecursiveDirectoryIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_FilesystemIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_FilesystemIterator, 0); zend_class_implements(class_entry, 1, class_entry_RecursiveIterator); return class_entry; @@ -612,7 +611,7 @@ static zend_class_entry *register_class_GlobIterator(zend_class_entry *class_ent zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "GlobIterator", class_GlobIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_FilesystemIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_FilesystemIterator, 0); zend_class_implements(class_entry, 1, class_entry_Countable); return class_entry; @@ -624,7 +623,7 @@ static zend_class_entry *register_class_SplFileObject(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplFileObject", class_SplFileObject_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_SplFileInfo); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_SplFileInfo, 0); zend_class_implements(class_entry, 2, class_entry_RecursiveIterator, class_entry_SeekableIterator); zval const_DROP_NEW_LINE_value; @@ -659,7 +658,7 @@ static zend_class_entry *register_class_SplTempFileObject(zend_class_entry *clas zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplTempFileObject", class_SplTempFileObject_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_SplFileObject); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_SplFileObject, 0); return class_entry; } diff --git a/ext/spl/spl_dllist_arginfo.h b/ext/spl/spl_dllist_arginfo.h index aa87f686bb70d..024fa6dc6e836 100644 --- a/ext/spl/spl_dllist_arginfo.h +++ b/ext/spl/spl_dllist_arginfo.h @@ -155,7 +155,7 @@ static zend_class_entry *register_class_SplDoublyLinkedList(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplDoublyLinkedList", class_SplDoublyLinkedList_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 4, class_entry_Iterator, class_entry_Countable, class_entry_ArrayAccess, class_entry_Serializable); zval const_IT_MODE_LIFO_value; @@ -190,7 +190,7 @@ static zend_class_entry *register_class_SplQueue(zend_class_entry *class_entry_S zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplQueue", class_SplQueue_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_SplDoublyLinkedList); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_SplDoublyLinkedList, 0); return class_entry; } @@ -200,7 +200,7 @@ static zend_class_entry *register_class_SplStack(zend_class_entry *class_entry_S zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplStack", class_SplStack_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_SplDoublyLinkedList); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_SplDoublyLinkedList, 0); return class_entry; } diff --git a/ext/spl/spl_exceptions_arginfo.h b/ext/spl/spl_exceptions_arginfo.h index f2594f1238d72..7165074b4aece 100644 --- a/ext/spl/spl_exceptions_arginfo.h +++ b/ext/spl/spl_exceptions_arginfo.h @@ -58,7 +58,7 @@ static zend_class_entry *register_class_LogicException(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "LogicException", class_LogicException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); return class_entry; } @@ -68,7 +68,7 @@ static zend_class_entry *register_class_BadFunctionCallException(zend_class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "BadFunctionCallException", class_BadFunctionCallException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_LogicException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_LogicException, 0); return class_entry; } @@ -78,7 +78,7 @@ static zend_class_entry *register_class_BadMethodCallException(zend_class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "BadMethodCallException", class_BadMethodCallException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_BadFunctionCallException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_BadFunctionCallException, 0); return class_entry; } @@ -88,7 +88,7 @@ static zend_class_entry *register_class_DomainException(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DomainException", class_DomainException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_LogicException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_LogicException, 0); return class_entry; } @@ -98,7 +98,7 @@ static zend_class_entry *register_class_InvalidArgumentException(zend_class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "InvalidArgumentException", class_InvalidArgumentException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_LogicException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_LogicException, 0); return class_entry; } @@ -108,7 +108,7 @@ static zend_class_entry *register_class_LengthException(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "LengthException", class_LengthException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_LogicException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_LogicException, 0); return class_entry; } @@ -118,7 +118,7 @@ static zend_class_entry *register_class_OutOfRangeException(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "OutOfRangeException", class_OutOfRangeException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_LogicException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_LogicException, 0); return class_entry; } @@ -128,7 +128,7 @@ static zend_class_entry *register_class_RuntimeException(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RuntimeException", class_RuntimeException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, 0); return class_entry; } @@ -138,7 +138,7 @@ static zend_class_entry *register_class_OutOfBoundsException(zend_class_entry *c zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "OutOfBoundsException", class_OutOfBoundsException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RuntimeException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RuntimeException, 0); return class_entry; } @@ -148,7 +148,7 @@ static zend_class_entry *register_class_OverflowException(zend_class_entry *clas zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "OverflowException", class_OverflowException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RuntimeException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RuntimeException, 0); return class_entry; } @@ -158,7 +158,7 @@ static zend_class_entry *register_class_RangeException(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RangeException", class_RangeException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RuntimeException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RuntimeException, 0); return class_entry; } @@ -168,7 +168,7 @@ static zend_class_entry *register_class_UnderflowException(zend_class_entry *cla zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "UnderflowException", class_UnderflowException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RuntimeException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RuntimeException, 0); return class_entry; } @@ -178,7 +178,7 @@ static zend_class_entry *register_class_UnexpectedValueException(zend_class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "UnexpectedValueException", class_UnexpectedValueException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RuntimeException); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RuntimeException, 0); return class_entry; } diff --git a/ext/spl/spl_fixedarray_arginfo.h b/ext/spl/spl_fixedarray_arginfo.h index 2e66e7060d50b..e517833a02b89 100644 --- a/ext/spl/spl_fixedarray_arginfo.h +++ b/ext/spl/spl_fixedarray_arginfo.h @@ -94,7 +94,7 @@ static zend_class_entry *register_class_SplFixedArray(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplFixedArray", class_SplFixedArray_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 4, class_entry_IteratorAggregate, class_entry_ArrayAccess, class_entry_Countable, class_entry_JsonSerializable); diff --git a/ext/spl/spl_heap_arginfo.h b/ext/spl/spl_heap_arginfo.h index 9910ae15cd988..31a3f79fe2c75 100644 --- a/ext/spl/spl_heap_arginfo.h +++ b/ext/spl/spl_heap_arginfo.h @@ -161,7 +161,7 @@ static zend_class_entry *register_class_SplPriorityQueue(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplPriorityQueue", class_SplPriorityQueue_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 2, class_entry_Iterator, class_entry_Countable); zval const_EXTR_BOTH_value; @@ -190,8 +190,7 @@ static zend_class_entry *register_class_SplHeap(zend_class_entry *class_entry_It zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplHeap", class_SplHeap_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_ABSTRACT; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_ABSTRACT); zend_class_implements(class_entry, 2, class_entry_Iterator, class_entry_Countable); return class_entry; @@ -202,7 +201,7 @@ static zend_class_entry *register_class_SplMinHeap(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplMinHeap", class_SplMinHeap_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_SplHeap); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_SplHeap, 0); return class_entry; } @@ -212,7 +211,7 @@ static zend_class_entry *register_class_SplMaxHeap(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplMaxHeap", class_SplMaxHeap_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_SplHeap); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_SplHeap, 0); return class_entry; } diff --git a/ext/spl/spl_iterators_arginfo.h b/ext/spl/spl_iterators_arginfo.h index 1d6566f6c6908..d0b0d5ddbcc87 100644 --- a/ext/spl/spl_iterators_arginfo.h +++ b/ext/spl/spl_iterators_arginfo.h @@ -605,7 +605,7 @@ static zend_class_entry *register_class_EmptyIterator(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "EmptyIterator", class_EmptyIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_Iterator); return class_entry; @@ -616,7 +616,7 @@ static zend_class_entry *register_class_CallbackFilterIterator(zend_class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "CallbackFilterIterator", class_CallbackFilterIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_FilterIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_FilterIterator, 0); return class_entry; } @@ -626,7 +626,7 @@ static zend_class_entry *register_class_RecursiveCallbackFilterIterator(zend_cla zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RecursiveCallbackFilterIterator", class_RecursiveCallbackFilterIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_CallbackFilterIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_CallbackFilterIterator, 0); zend_class_implements(class_entry, 1, class_entry_RecursiveIterator); return class_entry; @@ -648,7 +648,7 @@ static zend_class_entry *register_class_RecursiveIteratorIterator(zend_class_ent zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RecursiveIteratorIterator", class_RecursiveIteratorIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_OuterIterator); zval const_LEAVES_ONLY_value; @@ -694,7 +694,7 @@ static zend_class_entry *register_class_IteratorIterator(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "IteratorIterator", class_IteratorIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_OuterIterator); return class_entry; @@ -705,8 +705,7 @@ static zend_class_entry *register_class_FilterIterator(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "FilterIterator", class_FilterIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IteratorIterator); - class_entry->ce_flags |= ZEND_ACC_ABSTRACT; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IteratorIterator, ZEND_ACC_ABSTRACT); return class_entry; } @@ -716,8 +715,7 @@ static zend_class_entry *register_class_RecursiveFilterIterator(zend_class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RecursiveFilterIterator", class_RecursiveFilterIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_FilterIterator); - class_entry->ce_flags |= ZEND_ACC_ABSTRACT; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_FilterIterator, ZEND_ACC_ABSTRACT); zend_class_implements(class_entry, 1, class_entry_RecursiveIterator); return class_entry; @@ -728,7 +726,7 @@ static zend_class_entry *register_class_ParentIterator(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ParentIterator", class_ParentIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RecursiveFilterIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RecursiveFilterIterator, 0); return class_entry; } @@ -749,7 +747,7 @@ static zend_class_entry *register_class_LimitIterator(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "LimitIterator", class_LimitIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IteratorIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IteratorIterator, 0); return class_entry; } @@ -759,7 +757,7 @@ static zend_class_entry *register_class_CachingIterator(zend_class_entry *class_ zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "CachingIterator", class_CachingIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IteratorIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IteratorIterator, 0); zend_class_implements(class_entry, 3, class_entry_ArrayAccess, class_entry_Countable, class_entry_Stringable); zval const_CALL_TOSTRING_value; @@ -806,7 +804,7 @@ static zend_class_entry *register_class_RecursiveCachingIterator(zend_class_entr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RecursiveCachingIterator", class_RecursiveCachingIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_CachingIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_CachingIterator, 0); zend_class_implements(class_entry, 1, class_entry_RecursiveIterator); return class_entry; @@ -817,7 +815,7 @@ static zend_class_entry *register_class_NoRewindIterator(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "NoRewindIterator", class_NoRewindIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IteratorIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IteratorIterator, 0); return class_entry; } @@ -827,7 +825,7 @@ static zend_class_entry *register_class_AppendIterator(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "AppendIterator", class_AppendIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IteratorIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IteratorIterator, 0); return class_entry; } @@ -837,7 +835,7 @@ static zend_class_entry *register_class_InfiniteIterator(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "InfiniteIterator", class_InfiniteIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_IteratorIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_IteratorIterator, 0); return class_entry; } @@ -847,7 +845,7 @@ static zend_class_entry *register_class_RegexIterator(zend_class_entry *class_en zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RegexIterator", class_RegexIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_FilterIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_FilterIterator, 0); zval const_USE_KEY_value; ZVAL_LONG(&const_USE_KEY_value, REGIT_USE_KEY); @@ -905,7 +903,7 @@ static zend_class_entry *register_class_RecursiveRegexIterator(zend_class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RecursiveRegexIterator", class_RecursiveRegexIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RegexIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RegexIterator, 0); zend_class_implements(class_entry, 1, class_entry_RecursiveIterator); return class_entry; @@ -916,7 +914,7 @@ static zend_class_entry *register_class_RecursiveTreeIterator(zend_class_entry * zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RecursiveTreeIterator", class_RecursiveTreeIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_RecursiveIteratorIterator); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_RecursiveIteratorIterator, 0); zval const_BYPASS_CURRENT_value; ZVAL_LONG(&const_BYPASS_CURRENT_value, RTIT_BYPASS_CURRENT); diff --git a/ext/spl/spl_observer_arginfo.h b/ext/spl/spl_observer_arginfo.h index 730f4c279c254..be12c594e0146 100644 --- a/ext/spl/spl_observer_arginfo.h +++ b/ext/spl/spl_observer_arginfo.h @@ -255,7 +255,7 @@ static zend_class_entry *register_class_SplObjectStorage(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SplObjectStorage", class_SplObjectStorage_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 4, class_entry_Countable, class_entry_SeekableIterator, class_entry_Serializable, class_entry_ArrayAccess); return class_entry; @@ -266,7 +266,7 @@ static zend_class_entry *register_class_MultipleIterator(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "MultipleIterator", class_MultipleIterator_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_Iterator); zval const_MIT_NEED_ANY_value; diff --git a/ext/sqlite3/sqlite3_arginfo.h b/ext/sqlite3/sqlite3_arginfo.h index 9c813bace265c..31588ffd57345 100644 --- a/ext/sqlite3/sqlite3_arginfo.h +++ b/ext/sqlite3/sqlite3_arginfo.h @@ -294,8 +294,7 @@ static zend_class_entry *register_class_SQLite3Exception(zend_class_entry *class zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SQLite3Exception", class_SQLite3Exception_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); - class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Exception, ZEND_ACC_NO_DYNAMIC_PROPERTIES); return class_entry; } @@ -305,8 +304,7 @@ static zend_class_entry *register_class_SQLite3(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SQLite3", class_SQLite3_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); zval const_OK_value; ZVAL_LONG(&const_OK_value, SQLITE_OK); @@ -540,8 +538,7 @@ static zend_class_entry *register_class_SQLite3Stmt(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SQLite3Stmt", class_SQLite3Stmt_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -551,8 +548,7 @@ static zend_class_entry *register_class_SQLite3Result(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SQLite3Result", class_SQLite3Result_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 00bc7c5509d06..6834c3094dd73 100644 --- a/ext/standard/basic_functions_arginfo.h +++ b/ext/standard/basic_functions_arginfo.h @@ -4178,8 +4178,7 @@ static zend_class_entry *register_class___PHP_Incomplete_Class(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "__PHP_Incomplete_Class", class___PHP_Incomplete_Class_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES); zend_string *attribute_name_AllowDynamicProperties_class___PHP_Incomplete_Class_0 = zend_string_init_interned("AllowDynamicProperties", sizeof("AllowDynamicProperties") - 1, 1); zend_add_class_attribute(class_entry, attribute_name_AllowDynamicProperties_class___PHP_Incomplete_Class_0, 0); @@ -4193,7 +4192,7 @@ static zend_class_entry *register_class_AssertionError(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "AssertionError", class_AssertionError_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_Error, 0); return class_entry; } diff --git a/ext/standard/dir_arginfo.h b/ext/standard/dir_arginfo.h index cdf21396bb0ab..47ab180ed7b17 100644 --- a/ext/standard/dir_arginfo.h +++ b/ext/standard/dir_arginfo.h @@ -58,7 +58,7 @@ static zend_class_entry *register_class_Directory(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "Directory", class_Directory_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_path_default_value; ZVAL_UNDEF(&property_path_default_value); diff --git a/ext/standard/user_filters_arginfo.h b/ext/standard/user_filters_arginfo.h index a40a00f7ee476..f960a3a904e85 100644 --- a/ext/standard/user_filters_arginfo.h +++ b/ext/standard/user_filters_arginfo.h @@ -44,7 +44,7 @@ static zend_class_entry *register_class_php_user_filter(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "php_user_filter", class_php_user_filter_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_filtername_default_value; ZVAL_EMPTY_STRING(&property_filtername_default_value); @@ -72,8 +72,7 @@ static zend_class_entry *register_class_StreamBucket(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "StreamBucket", class_StreamBucket_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zval property_bucket_default_value; ZVAL_NULL(&property_bucket_default_value); diff --git a/ext/sysvmsg/sysvmsg_arginfo.h b/ext/sysvmsg/sysvmsg_arginfo.h index 34eca90d6feb8..a5e84383e16ca 100644 --- a/ext/sysvmsg/sysvmsg_arginfo.h +++ b/ext/sysvmsg/sysvmsg_arginfo.h @@ -80,8 +80,7 @@ static zend_class_entry *register_class_SysvMessageQueue(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SysvMessageQueue", class_SysvMessageQueue_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/sysvsem/sysvsem_arginfo.h b/ext/sysvsem/sysvsem_arginfo.h index 4411a7319caab..d35ab67de2c74 100644 --- a/ext/sysvsem/sysvsem_arginfo.h +++ b/ext/sysvsem/sysvsem_arginfo.h @@ -41,8 +41,7 @@ static zend_class_entry *register_class_SysvSemaphore(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SysvSemaphore", class_SysvSemaphore_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/sysvshm/sysvshm_arginfo.h b/ext/sysvshm/sysvshm_arginfo.h index 05715b2e79ffb..2c4b401a439c6 100644 --- a/ext/sysvshm/sysvshm_arginfo.h +++ b/ext/sysvshm/sysvshm_arginfo.h @@ -59,8 +59,7 @@ static zend_class_entry *register_class_SysvSharedMemory(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "SysvSharedMemory", class_SysvSharedMemory_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/tidy/tidy_arginfo.h b/ext/tidy/tidy_arginfo.h index 99cc28b68099d..56c0b78c32e47 100644 --- a/ext/tidy/tidy_arginfo.h +++ b/ext/tidy/tidy_arginfo.h @@ -526,7 +526,7 @@ static zend_class_entry *register_class_tidy(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "tidy", class_tidy_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_errorBuffer_default_value; ZVAL_NULL(&property_errorBuffer_default_value); @@ -548,8 +548,7 @@ static zend_class_entry *register_class_tidyNode(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "tidyNode", class_tidyNode_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zval property_value_default_value; ZVAL_UNDEF(&property_value_default_value); diff --git a/ext/tokenizer/tokenizer_arginfo.h b/ext/tokenizer/tokenizer_arginfo.h index e7ab3e31cf39c..04b7406596130 100644 --- a/ext/tokenizer/tokenizer_arginfo.h +++ b/ext/tokenizer/tokenizer_arginfo.h @@ -67,7 +67,7 @@ static zend_class_entry *register_class_PhpToken(zend_class_entry *class_entry_S zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "PhpToken", class_PhpToken_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_Stringable); zval property_id_default_value; diff --git a/ext/xml/xml_arginfo.h b/ext/xml/xml_arginfo.h index 7b31981ed60da..824ae0bfedfe3 100644 --- a/ext/xml/xml_arginfo.h +++ b/ext/xml/xml_arginfo.h @@ -185,8 +185,7 @@ static zend_class_entry *register_class_XMLParser(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "XMLParser", class_XMLParser_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } diff --git a/ext/xmlreader/php_xmlreader_arginfo.h b/ext/xmlreader/php_xmlreader_arginfo.h index a5a0c12cd2593..4e2a431a55c29 100644 --- a/ext/xmlreader/php_xmlreader_arginfo.h +++ b/ext/xmlreader/php_xmlreader_arginfo.h @@ -176,7 +176,7 @@ static zend_class_entry *register_class_XMLReader(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "XMLReader", class_XMLReader_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval const_NONE_value; ZVAL_LONG(&const_NONE_value, XML_READER_TYPE_NONE); diff --git a/ext/xmlwriter/php_xmlwriter_arginfo.h b/ext/xmlwriter/php_xmlwriter_arginfo.h index fda02c49f6f81..ebccf4225ba9f 100644 --- a/ext/xmlwriter/php_xmlwriter_arginfo.h +++ b/ext/xmlwriter/php_xmlwriter_arginfo.h @@ -484,7 +484,7 @@ static zend_class_entry *register_class_XMLWriter(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "XMLWriter", class_XMLWriter_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); return class_entry; } diff --git a/ext/xsl/php_xsl_arginfo.h b/ext/xsl/php_xsl_arginfo.h index 20559328d8181..d040928197f65 100644 --- a/ext/xsl/php_xsl_arginfo.h +++ b/ext/xsl/php_xsl_arginfo.h @@ -117,7 +117,7 @@ static zend_class_entry *register_class_XSLTProcessor(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "XSLTProcessor", class_XSLTProcessor_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_doXInclude_default_value; ZVAL_FALSE(&property_doXInclude_default_value); diff --git a/ext/zend_test/fiber_arginfo.h b/ext/zend_test/fiber_arginfo.h index c25ed876614b4..e4a0b51bebc9d 100644 --- a/ext/zend_test/fiber_arginfo.h +++ b/ext/zend_test/fiber_arginfo.h @@ -39,8 +39,7 @@ static zend_class_entry *register_class__ZendTestFiber(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "_ZendTestFiber", class__ZendTestFiber_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); return class_entry; } diff --git a/ext/zend_test/iterators_arginfo.h b/ext/zend_test/iterators_arginfo.h index 2661550c5f6cd..3ec78808eaa19 100644 --- a/ext/zend_test/iterators_arginfo.h +++ b/ext/zend_test/iterators_arginfo.h @@ -21,8 +21,7 @@ static zend_class_entry *register_class_ZendTest_Iterators_TraversableTest(zend_ zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "ZendTest\\Iterators", "TraversableTest", class_ZendTest_Iterators_TraversableTest_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zend_class_implements(class_entry, 1, class_entry_IteratorAggregate); return class_entry; diff --git a/ext/zend_test/object_handlers_arginfo.h b/ext/zend_test/object_handlers_arginfo.h index 510a6602ab0be..84a9203fd7ea8 100644 --- a/ext/zend_test/object_handlers_arginfo.h +++ b/ext/zend_test/object_handlers_arginfo.h @@ -49,8 +49,7 @@ static zend_class_entry *register_class_DoOperationNoCast(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DoOperationNoCast", class_DoOperationNoCast_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zval property_val_default_value; ZVAL_UNDEF(&property_val_default_value); @@ -66,8 +65,7 @@ static zend_class_entry *register_class_LongCastableNoOperations(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "LongCastableNoOperations", class_LongCastableNoOperations_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zval property_val_default_value; ZVAL_UNDEF(&property_val_default_value); @@ -83,8 +81,7 @@ static zend_class_entry *register_class_FloatCastableNoOperations(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "FloatCastableNoOperations", class_FloatCastableNoOperations_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zval property_val_default_value; ZVAL_UNDEF(&property_val_default_value); @@ -100,8 +97,7 @@ static zend_class_entry *register_class_NumericCastableNoOperations(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "NumericCastableNoOperations", class_NumericCastableNoOperations_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); zval property_val_default_value; ZVAL_UNDEF(&property_val_default_value); @@ -117,7 +113,7 @@ static zend_class_entry *register_class_DimensionHandlersNoArrayAccess(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DimensionHandlersNoArrayAccess", class_DimensionHandlersNoArrayAccess_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zval property_read_default_value; ZVAL_FALSE(&property_read_default_value); diff --git a/ext/zend_test/test_arginfo.h b/ext/zend_test/test_arginfo.h index d1c587420fc2d..ac0d572147a59 100644 --- a/ext/zend_test/test_arginfo.h +++ b/ext/zend_test/test_arginfo.h @@ -620,7 +620,11 @@ static zend_class_entry *register_class__ZendTestClass(zend_class_entry *class_e zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "_ZendTestClass", class__ZendTestClass_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif zend_class_implements(class_entry, 1, class_entry__ZendTestInterface); zend_register_class_alias("_ZendTestClassAlias", class_entry); @@ -753,7 +757,11 @@ static zend_class_entry *register_class__ZendTestMagicCall(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "_ZendTestMagicCall", class__ZendTestMagicCall_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif return class_entry; } @@ -763,7 +771,11 @@ static zend_class_entry *register_class__ZendTestChildClass(zend_class_entry *cl zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "_ZendTestChildClass", class__ZendTestChildClass_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, class_entry__ZendTestClass, 0); +#else class_entry = zend_register_internal_class_ex(&ce, class_entry__ZendTestClass); +#endif return class_entry; } @@ -773,7 +785,11 @@ static zend_class_entry *register_class_ZendAttributeTest(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendAttributeTest", class_ZendAttributeTest_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif zval const_TEST_CONST_value; ZVAL_LONG(&const_TEST_CONST_value, 1); @@ -822,8 +838,12 @@ static zend_class_entry *register_class__ZendTestTrait(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "_ZendTestTrait", class__ZendTestTrait_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_TRAIT); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); class_entry->ce_flags |= ZEND_ACC_TRAIT; +#endif zval property_testProp_default_value; ZVAL_NULL(&property_testProp_default_value); @@ -852,8 +872,12 @@ static zend_class_entry *register_class_ZendTestAttribute(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendTestAttribute", class_ZendTestAttribute_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); class_entry->ce_flags |= ZEND_ACC_FINAL; +#endif zend_string *attribute_name_Attribute_class_ZendTestAttribute_0 = zend_string_init_interned("Attribute", sizeof("Attribute") - 1, 1); zend_attribute *attribute_Attribute_class_ZendTestAttribute_0 = zend_add_class_attribute(class_entry, attribute_name_Attribute_class_ZendTestAttribute_0, 1); @@ -870,8 +894,12 @@ static zend_class_entry *register_class_ZendTestAttributeWithArguments(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendTestAttributeWithArguments", class_ZendTestAttributeWithArguments_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); class_entry->ce_flags |= ZEND_ACC_FINAL; +#endif zval property_arg_default_value; ZVAL_UNDEF(&property_arg_default_value); @@ -898,8 +926,12 @@ static zend_class_entry *register_class_ZendTestRepeatableAttribute(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendTestRepeatableAttribute", class_ZendTestRepeatableAttribute_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); class_entry->ce_flags |= ZEND_ACC_FINAL; +#endif zend_string *attribute_name_Attribute_class_ZendTestRepeatableAttribute_0 = zend_string_init_interned("Attribute", sizeof("Attribute") - 1, 1); zend_attribute *attribute_Attribute_class_ZendTestRepeatableAttribute_0 = zend_add_class_attribute(class_entry, attribute_name_Attribute_class_ZendTestRepeatableAttribute_0, 1); @@ -916,8 +948,12 @@ static zend_class_entry *register_class_ZendTestParameterAttribute(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendTestParameterAttribute", class_ZendTestParameterAttribute_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); class_entry->ce_flags |= ZEND_ACC_FINAL; +#endif zval property_parameter_default_value; ZVAL_UNDEF(&property_parameter_default_value); @@ -940,8 +976,12 @@ static zend_class_entry *register_class_ZendTestPropertyAttribute(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendTestPropertyAttribute", class_ZendTestPropertyAttribute_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); class_entry->ce_flags |= ZEND_ACC_FINAL; +#endif #if (PHP_VERSION_ID >= 80400) class_entry->doc_comment = zend_string_init_interned("/**\n * \"Lorem ipsum\"\n * @see https://www.php.net\n * @since 8.1\n */", 82, 1); #endif @@ -968,7 +1008,11 @@ static zend_class_entry *register_class_ZendTestClassWithMethodWithParameterAttr zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendTestClassWithMethodWithParameterAttribute", class_ZendTestClassWithMethodWithParameterAttribute_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif zend_string *attribute_name_ZendTestParameterAttribute_func_no_override_arg0_0 = zend_string_init_interned("ZendTestParameterAttribute", sizeof("ZendTestParameterAttribute") - 1, 1); @@ -995,7 +1039,11 @@ static zend_class_entry *register_class_ZendTestChildClassWithMethodWithParamete zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendTestChildClassWithMethodWithParameterAttribute", class_ZendTestChildClassWithMethodWithParameterAttribute_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, class_entry_ZendTestClassWithMethodWithParameterAttribute, 0); +#else class_entry = zend_register_internal_class_ex(&ce, class_entry_ZendTestClassWithMethodWithParameterAttribute); +#endif zend_string *attribute_name_ZendTestParameterAttribute_func_override_arg0_0 = zend_string_init_interned("ZendTestParameterAttribute", sizeof("ZendTestParameterAttribute") - 1, 1); @@ -1014,7 +1062,11 @@ static zend_class_entry *register_class_ZendTestClassWithPropertyAttribute(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendTestClassWithPropertyAttribute", class_ZendTestClassWithPropertyAttribute_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif zval property_attributed_default_value; ZVAL_UNDEF(&property_attributed_default_value); @@ -1035,8 +1087,12 @@ static zend_class_entry *register_class_ZendTestForbidDynamicCall(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZendTestForbidDynamicCall", class_ZendTestForbidDynamicCall_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); class_entry->ce_flags |= ZEND_ACC_FINAL; +#endif return class_entry; } @@ -1109,7 +1165,11 @@ static zend_class_entry *register_class_ZendTestNS_Foo(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "ZendTestNS", "Foo", class_ZendTestNS_Foo_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif return class_entry; } @@ -1119,7 +1179,11 @@ static zend_class_entry *register_class_ZendTestNS_UnlikelyCompileError(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "ZendTestNS", "UnlikelyCompileError", class_ZendTestNS_UnlikelyCompileError_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif return class_entry; } @@ -1129,7 +1193,11 @@ static zend_class_entry *register_class_ZendTestNS_NotUnlikelyCompileError(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "ZendTestNS", "NotUnlikelyCompileError", class_ZendTestNS_NotUnlikelyCompileError_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif return class_entry; } @@ -1139,7 +1207,11 @@ static zend_class_entry *register_class_ZendTestNS2_Foo(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "ZendTestNS2", "Foo", class_ZendTestNS2_Foo_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif zval property_foo_default_value; ZVAL_UNDEF(&property_foo_default_value); @@ -1156,7 +1228,11 @@ static zend_class_entry *register_class_ZendTestNS2_ZendSubNS_Foo(void) zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "ZendTestNS2\\ZendSubNS", "Foo", class_ZendTestNS2_ZendSubNS_Foo_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif return class_entry; } diff --git a/ext/zip/php_zip_arginfo.h b/ext/zip/php_zip_arginfo.h index 2a43bc4bf76a7..79e1185cfa164 100644 --- a/ext/zip/php_zip_arginfo.h +++ b/ext/zip/php_zip_arginfo.h @@ -616,7 +616,7 @@ static zend_class_entry *register_class_ZipArchive(zend_class_entry *class_entry zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "ZipArchive", class_ZipArchive_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); zend_class_implements(class_entry, 1, class_entry_Countable); zval const_CREATE_value; diff --git a/ext/zlib/zlib_arginfo.h b/ext/zlib/zlib_arginfo.h index 1c0c9746d3d27..c29bd68936195 100644 --- a/ext/zlib/zlib_arginfo.h +++ b/ext/zlib/zlib_arginfo.h @@ -240,8 +240,7 @@ static zend_class_entry *register_class_InflateContext(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "InflateContext", class_InflateContext_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; } @@ -251,8 +250,7 @@ static zend_class_entry *register_class_DeflateContext(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DeflateContext", class_DeflateContext_methods); - class_entry = zend_register_internal_class_ex(&ce, NULL); - class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE; + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES|ZEND_ACC_NOT_SERIALIZABLE); return class_entry; }