diff --git a/crates/stub-parser/src/builder.rs b/crates/stub-parser/src/builder.rs index 2f840fa..539aca8 100644 --- a/crates/stub-parser/src/builder.rs +++ b/crates/stub-parser/src/builder.rs @@ -959,7 +959,7 @@ impl ArgInfoBuilder<'_> { {class_attributes_str}\ \n{space}class_entry\ \n}}", - properties.join("\n "), + properties.join("\n"), constants.join("\n"), methods_param = registration_params.join(", "), module_parts = module_parts.join("\n"), @@ -1485,11 +1485,16 @@ impl ArgInfoBuilder<'_> { } else { String::new() }; - format!( - "{}{extra_uses_code}{}\n{}\n", + let result = format!( + "{}{extra_uses_code}{}\n{}", self.scope.as_uses(), verification_code, self.parts.join("\n") - ) + ); + let trimmed = result.trim().to_owned() + "\n"; + if let Ok(regex) = Regex::new("\n\n\n+") { + return regex.replace_all(&trimmed, "\n\n").into_owned(); + } + trimmed } } diff --git a/crates/stub-parser/tests/cases/attribute_registration.expected b/crates/stub-parser/tests/cases/attribute_registration.expected index fdcd3a1..a5687cb 100644 --- a/crates/stub-parser/tests/cases/attribute_registration.expected +++ b/crates/stub-parser/tests/cases/attribute_registration.expected @@ -1,4 +1,3 @@ - /// Module for `CustomCastable` class. pub(crate) mod CustomCastable { use rsphp_macros_c::ZVAL_LONG; @@ -24,7 +23,6 @@ pub(crate) mod CustomCastable { ) }; - unsafe { let name: *mut zend_string = (zend_string_init_interned.expect("zend_string_init_interned should be set"))( c"Attribute".as_ptr(), diff --git a/crates/stub-parser/tests/cases/backed_enum.expected b/crates/stub-parser/tests/cases/backed_enum.expected index 5c45c8b..75f3cb3 100644 --- a/crates/stub-parser/tests/cases/backed_enum.expected +++ b/crates/stub-parser/tests/cases/backed_enum.expected @@ -1,10 +1,8 @@ - /// Module for `Demo` enum. pub(crate) mod Demo { use rsphp_macros_c::ZVAL_STR; use rsphp_sys::{IS_STRING, zend_class_entry, zend_enum_add_case_cstr, zend_string, zend_string_init, zval}; - /// Register the `Demo` enum. pub(crate) fn register_enum() -> *mut zend_class_entry { let class_entry: *mut zend_class_entry = unsafe { @@ -37,7 +35,6 @@ pub(crate) mod Demo { } }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/class_constant_unknown.expected b/crates/stub-parser/tests/cases/class_constant_unknown.expected index 42d5b6b..9caa53f 100644 --- a/crates/stub-parser/tests/cases/class_constant_unknown.expected +++ b/crates/stub-parser/tests/cases/class_constant_unknown.expected @@ -1,10 +1,8 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_LONG}; use rsphp_sys::{MAY_BE_LONG, ZEND_ACC_DEPRECATED, ZEND_ACC_PUBLIC, zend_class_entry, zend_declare_typed_class_constant, zend_string, zend_string_init_interned, zend_string_release_ex, zval}; - /// Register the `Demo` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; diff --git a/crates/stub-parser/tests/cases/class_constants.expected b/crates/stub-parser/tests/cases/class_constants.expected index a3f3337..65f0612 100644 --- a/crates/stub-parser/tests/cases/class_constants.expected +++ b/crates/stub-parser/tests/cases/class_constants.expected @@ -1,4 +1,3 @@ - /// Module for `CustomCastable` class. pub(crate) mod CustomCastable { use rsphp_macros_c::{ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE, ZEND_TYPE_INIT_MASK, ZVAL_LONG, ZVAL_UNDEF}; @@ -111,7 +110,6 @@ pub(crate) mod ConstantValues { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_DOUBLE, ZVAL_STR}; use rsphp_sys::{MAY_BE_DOUBLE, MAY_BE_STRING, PHP_OS, ZEND_ACC_PUBLIC, ZEND_DEBUG, zend_class_entry, zend_declare_typed_class_constant, zend_string, zend_string_init, zend_string_init_interned, zend_string_release_ex, zval}; - /// Register the `ConstantValues` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -164,7 +162,6 @@ pub(crate) mod ImplicitPublicConstant { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_LONG}; use rsphp_sys::{MAY_BE_LONG, ZEND_ACC_PUBLIC, zend_class_entry, zend_declare_typed_class_constant, zend_string, zend_string_init_interned, zend_string_release_ex, zval}; - /// Register the `ImplicitPublicConstant` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; diff --git a/crates/stub-parser/tests/cases/class_extends.expected b/crates/stub-parser/tests/cases/class_extends.expected index 9c18e02..03acdb2 100644 --- a/crates/stub-parser/tests/cases/class_extends.expected +++ b/crates/stub-parser/tests/cases/class_extends.expected @@ -1,9 +1,7 @@ - /// Module for `Base` class. pub(crate) mod Base { use rsphp_sys::zend_class_entry; - /// Register the `Base` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -16,7 +14,6 @@ pub(crate) mod Base { ) }; - class_entry } } @@ -24,7 +21,6 @@ pub(crate) mod Base { pub(crate) mod Demo { use rsphp_sys::zend_class_entry; - /// Register the `Demo` class. pub(crate) fn register_class(zend_ce_Base: *mut zend_class_entry) -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -37,7 +33,6 @@ pub(crate) mod Demo { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/class_flags.expected b/crates/stub-parser/tests/cases/class_flags.expected index 57a1482..c4ac307 100644 --- a/crates/stub-parser/tests/cases/class_flags.expected +++ b/crates/stub-parser/tests/cases/class_flags.expected @@ -1,9 +1,7 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_sys::{ZEND_ACC_FINAL, ZEND_ACC_NO_DYNAMIC_PROPERTIES, zend_class_entry}; - /// Register the `Demo` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -16,7 +14,6 @@ pub(crate) mod Demo { ) }; - class_entry } } @@ -24,7 +21,6 @@ pub(crate) mod Demo { pub(crate) mod Demo2 { use rsphp_sys::{ZEND_ACC_FINAL, ZEND_ACC_NOT_SERIALIZABLE, zend_class_entry}; - /// Register the `Demo2` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -37,7 +33,6 @@ pub(crate) mod Demo2 { ) }; - class_entry } } @@ -45,7 +40,6 @@ pub(crate) mod Demo2 { pub(crate) mod Demo3 { use rsphp_sys::{ZEND_ACC_FINAL, ZEND_ACC_NOT_SERIALIZABLE, ZEND_ACC_NO_DYNAMIC_PROPERTIES, zend_class_entry}; - /// Register the `Demo3` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -58,7 +52,6 @@ pub(crate) mod Demo3 { ) }; - class_entry } } @@ -66,7 +59,6 @@ pub(crate) mod Demo3 { pub(crate) mod IsAbstract { use rsphp_sys::{ZEND_ACC_ABSTRACT, zend_class_entry}; - /// Register the `IsAbstract` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -79,7 +71,6 @@ pub(crate) mod IsAbstract { ) }; - class_entry } } @@ -87,7 +78,6 @@ pub(crate) mod IsAbstract { pub(crate) mod IsReadOnly { use rsphp_sys::{ZEND_ACC_FINAL, ZEND_ACC_READONLY_CLASS, zend_class_entry}; - /// Register the `IsReadOnly` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -100,7 +90,6 @@ pub(crate) mod IsReadOnly { ) }; - class_entry } } @@ -108,7 +97,6 @@ pub(crate) mod IsReadOnly { pub(crate) mod AllowsDynamicProperties { use rsphp_sys::{ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES, zend_add_class_attribute, zend_class_entry, zend_string, zend_string_init_interned, zend_string_release_ex}; - /// Register the `AllowsDynamicProperties` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -121,7 +109,6 @@ pub(crate) mod AllowsDynamicProperties { ) }; - unsafe { let name: *mut zend_string = (zend_string_init_interned.expect("zend_string_init_interned should be set"))( c"AllowDynamicProperties".as_ptr(), diff --git a/crates/stub-parser/tests/cases/class_implements.expected b/crates/stub-parser/tests/cases/class_implements.expected index 5fa486b..9867006 100644 --- a/crates/stub-parser/tests/cases/class_implements.expected +++ b/crates/stub-parser/tests/cases/class_implements.expected @@ -1,9 +1,7 @@ - /// Module for `IDemo` interface. pub(crate) mod IDemo { use rsphp_sys::zend_class_entry; - /// Register the `IDemo` interface. pub(crate) fn register_interface() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -14,7 +12,6 @@ pub(crate) mod IDemo { ) }; - class_entry } } @@ -22,7 +19,6 @@ pub(crate) mod IDemo { pub(crate) mod Demo { use rsphp_sys::{zend_class_entry, zend_class_implements}; - /// Register the `Demo` class. pub(crate) fn register_class(zend_ce_IDemo: *mut zend_class_entry) -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -42,7 +38,6 @@ pub(crate) mod Demo { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/class_registration.expected b/crates/stub-parser/tests/cases/class_registration.expected index b480d32..65eea26 100644 --- a/crates/stub-parser/tests/cases/class_registration.expected +++ b/crates/stub-parser/tests/cases/class_registration.expected @@ -1,10 +1,8 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_UNDEF}; use rsphp_sys::{MAY_BE_LONG, ZEND_ACC_PRIVATE, zend_class_entry, zend_declare_typed_property, zend_string, zend_string_init, zend_string_release, zval}; - /// Register the `Demo` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; diff --git a/crates/stub-parser/tests/cases/default_unknown_param.expected b/crates/stub-parser/tests/cases/default_unknown_param.expected index ba0f641..9b197fb 100644 --- a/crates/stub-parser/tests/cases/default_unknown_param.expected +++ b/crates/stub-parser/tests/cases/default_unknown_param.expected @@ -1,4 +1,3 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_macros_c::ZEND_ARG_TYPE_INFO; @@ -25,7 +24,6 @@ pub(crate) mod Demo { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/enum.expected b/crates/stub-parser/tests/cases/enum.expected index a39359c..96ca350 100644 --- a/crates/stub-parser/tests/cases/enum.expected +++ b/crates/stub-parser/tests/cases/enum.expected @@ -1,9 +1,7 @@ - /// Module for `CustomCasting\CastableTarget` enum. pub(crate) mod CustomCasting_CastableTarget { use rsphp_sys::{IS_UNDEF, zend_class_entry, zend_enum_add_case_cstr}; - /// Register the `CustomCasting\CastableTarget` enum. pub(crate) fn register_enum() -> *mut zend_class_entry { let class_entry: *mut zend_class_entry = unsafe { @@ -19,7 +17,6 @@ pub(crate) mod CustomCasting_CastableTarget { zend_enum_add_case_cstr(class_entry, c"CAST_LONG".as_ptr(), std::ptr::null_mut()); }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/enum_types.expected b/crates/stub-parser/tests/cases/enum_types.expected index 648b31a..1e180e7 100644 --- a/crates/stub-parser/tests/cases/enum_types.expected +++ b/crates/stub-parser/tests/cases/enum_types.expected @@ -1,9 +1,7 @@ - /// Module for `Unbacked` enum. pub(crate) mod Unbacked { use rsphp_sys::{IS_UNDEF, zend_class_entry, zend_enum_add_case_cstr}; - /// Register the `Unbacked` enum. pub(crate) fn register_enum() -> *mut zend_class_entry { let class_entry: *mut zend_class_entry = unsafe { @@ -18,7 +16,6 @@ pub(crate) mod Unbacked { zend_enum_add_case_cstr(class_entry, c"Bar".as_ptr(), std::ptr::null_mut()); }; - class_entry } } @@ -27,7 +24,6 @@ pub(crate) mod IntBacked { use rsphp_macros_c::ZVAL_LONG; use rsphp_sys::{IS_LONG, zend_class_entry, zend_enum_add_case_cstr, zval}; - /// Register the `IntBacked` enum. pub(crate) fn register_enum() -> *mut zend_class_entry { let class_entry: *mut zend_class_entry = unsafe { @@ -50,7 +46,6 @@ pub(crate) mod IntBacked { } }; - class_entry } } @@ -59,7 +54,6 @@ pub(crate) mod StringBacked { use rsphp_macros_c::ZVAL_STR; use rsphp_sys::{IS_STRING, zend_class_entry, zend_enum_add_case_cstr, zend_string, zend_string_init, zval}; - /// Register the `StringBacked` enum. pub(crate) fn register_enum() -> *mut zend_class_entry { let class_entry: *mut zend_class_entry = unsafe { @@ -92,7 +86,6 @@ pub(crate) mod StringBacked { } }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/functions.expected b/crates/stub-parser/tests/cases/functions.expected index ea660eb..02aea3c 100644 --- a/crates/stub-parser/tests/cases/functions.expected +++ b/crates/stub-parser/tests/cases/functions.expected @@ -35,4 +35,3 @@ pub(crate) const ARGINFO_TEST6: [zend_internal_arg_info; 2] = [ ZEND_ARG_INFO_FOR_FUNCTION_WITH_RETURN_TYPE_MASK!(0, 0, MAY_BE_LONG, 0), ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE!(0, "v", IS_LONG, 0, "123"), ]; - diff --git a/crates/stub-parser/tests/cases/interface_extends.expected b/crates/stub-parser/tests/cases/interface_extends.expected index 5fe343f..d0f617e 100644 --- a/crates/stub-parser/tests/cases/interface_extends.expected +++ b/crates/stub-parser/tests/cases/interface_extends.expected @@ -1,9 +1,7 @@ - /// Module for `HasMagic` interface. pub(crate) mod HasMagic { use rsphp_sys::{zend_class_entry, zend_class_implements}; - /// Register the `HasMagic` interface. pub(crate) fn register_interface(zend_ce_Countable: *mut zend_class_entry, zend_ce_Stringable: *mut zend_class_entry) -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -22,7 +20,6 @@ pub(crate) mod HasMagic { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/interface_registration.expected b/crates/stub-parser/tests/cases/interface_registration.expected index 65193dd..11f1452 100644 --- a/crates/stub-parser/tests/cases/interface_registration.expected +++ b/crates/stub-parser/tests/cases/interface_registration.expected @@ -1,9 +1,7 @@ - /// Module for `CustomCasting\CastableTarget` enum. pub(crate) mod CustomCasting_CastableTarget { use rsphp_sys::{IS_UNDEF, zend_class_entry, zend_enum_add_case_cstr}; - /// Register the `CustomCasting\CastableTarget` enum. pub(crate) fn register_enum() -> *mut zend_class_entry { let class_entry: *mut zend_class_entry = unsafe { @@ -19,7 +17,6 @@ pub(crate) mod CustomCasting_CastableTarget { zend_enum_add_case_cstr(class_entry, c"CAST_LONG".as_ptr(), std::ptr::null_mut()); }; - class_entry } } @@ -47,7 +44,6 @@ pub(crate) mod CustomCasting_HasCustomCast { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/method_attribs.expected b/crates/stub-parser/tests/cases/method_attribs.expected index f3ce178..61df2ea 100644 --- a/crates/stub-parser/tests/cases/method_attribs.expected +++ b/crates/stub-parser/tests/cases/method_attribs.expected @@ -1,4 +1,3 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_macros_c::{ZSTR_KNOWN, ZSTR_LEN, ZVAL_STR}; @@ -24,7 +23,6 @@ pub(crate) mod Demo { ) }; - unsafe { let fn_ptr: *mut zend_function = zend_hash_str_find_ptr( std::ptr::from_ref::(&(*class_entry).function_table), diff --git a/crates/stub-parser/tests/cases/methods.expected b/crates/stub-parser/tests/cases/methods.expected index 1361f5f..314f15e 100644 --- a/crates/stub-parser/tests/cases/methods.expected +++ b/crates/stub-parser/tests/cases/methods.expected @@ -1,4 +1,3 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_macros_c::{ZEND_ARG_INFO, ZEND_ARG_INFO_WITH_DEFAULT_VALUE, ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE}; @@ -53,7 +52,6 @@ pub(crate) mod Demo { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/namespaced_bodies.expected b/crates/stub-parser/tests/cases/namespaced_bodies.expected index 654c5cb..60addd6 100644 --- a/crates/stub-parser/tests/cases/namespaced_bodies.expected +++ b/crates/stub-parser/tests/cases/namespaced_bodies.expected @@ -25,7 +25,6 @@ pub(crate) mod Demo_InDemoNamespace { ) }; - class_entry } } @@ -58,7 +57,6 @@ pub(crate) mod Other_InOtherNamespace { ) }; - class_entry } } @@ -66,4 +64,3 @@ pub(crate) mod Other_InOtherNamespace { pub(crate) const ARGINFO_OTHER_INOTHERNAMESPACE: [zend_internal_arg_info; 1] = [ ZEND_ARG_INFO_FOR_FUNCTION_WITH_RETURN_TYPE_MASK!(0, 0, MAY_BE_ANY, 0), ]; - diff --git a/crates/stub-parser/tests/cases/namespaced_default.expected b/crates/stub-parser/tests/cases/namespaced_default.expected index 05f8356..eb9c1a7 100644 --- a/crates/stub-parser/tests/cases/namespaced_default.expected +++ b/crates/stub-parser/tests/cases/namespaced_default.expected @@ -1,4 +1,3 @@ - /// Module for `CustomCasting\CustomCastable` class. pub(crate) mod CustomCasting_CustomCastable { use rsphp_macros_c::{ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE, ZEND_TYPE_INIT_MASK, ZVAL_LONG}; diff --git a/crates/stub-parser/tests/cases/namespaced_semi.expected b/crates/stub-parser/tests/cases/namespaced_semi.expected index f789dbd..c81ada0 100644 --- a/crates/stub-parser/tests/cases/namespaced_semi.expected +++ b/crates/stub-parser/tests/cases/namespaced_semi.expected @@ -25,7 +25,6 @@ pub(crate) mod Demo_InDemoNamespace { ) }; - class_entry } } @@ -33,4 +32,3 @@ pub(crate) mod Demo_InDemoNamespace { pub(crate) const ARGINFO_DEMO_INDEMONAMESPACE: [zend_internal_arg_info; 1] = [ ZEND_ARG_INFO_FOR_FUNCTION_WITH_RETURN_TYPE_MASK!(0, 0, MAY_BE_VOID, 0), ]; - diff --git a/crates/stub-parser/tests/cases/namespaced_types.expected b/crates/stub-parser/tests/cases/namespaced_types.expected index 65193dd..11f1452 100644 --- a/crates/stub-parser/tests/cases/namespaced_types.expected +++ b/crates/stub-parser/tests/cases/namespaced_types.expected @@ -1,9 +1,7 @@ - /// Module for `CustomCasting\CastableTarget` enum. pub(crate) mod CustomCasting_CastableTarget { use rsphp_sys::{IS_UNDEF, zend_class_entry, zend_enum_add_case_cstr}; - /// Register the `CustomCasting\CastableTarget` enum. pub(crate) fn register_enum() -> *mut zend_class_entry { let class_entry: *mut zend_class_entry = unsafe { @@ -19,7 +17,6 @@ pub(crate) mod CustomCasting_CastableTarget { zend_enum_add_case_cstr(class_entry, c"CAST_LONG".as_ptr(), std::ptr::null_mut()); }; - class_entry } } @@ -47,7 +44,6 @@ pub(crate) mod CustomCasting_HasCustomCast { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/nullable_property.expected b/crates/stub-parser/tests/cases/nullable_property.expected index 0b68768..c7d3f35 100644 --- a/crates/stub-parser/tests/cases/nullable_property.expected +++ b/crates/stub-parser/tests/cases/nullable_property.expected @@ -1,10 +1,8 @@ - /// Module for `Reference` class. pub(crate) mod Reference { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_UNDEF}; use rsphp_sys::{MAY_BE_NULL, MAY_BE_STRING, ZEND_ACC_FINAL, ZEND_ACC_NOT_SERIALIZABLE, ZEND_ACC_NO_DYNAMIC_PROPERTIES, ZEND_ACC_PUBLIC, ZEND_ACC_READONLY, zend_class_entry, zend_declare_typed_property, zend_string, zend_string_init, zend_string_release, zval}; - /// Register the `Reference` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -39,7 +37,7 @@ pub(crate) mod Reference { unsafe { zend_string_release(property_name_name); } - + let mut property_shorthand_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_shorthand_default_value)); } let property_shorthand_name: *mut zend_string = unsafe { @@ -62,7 +60,7 @@ pub(crate) mod Reference { unsafe { zend_string_release(property_shorthand_name); } - + let mut property_symbolicTarget_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_symbolicTarget_default_value)); } let property_symbolicTarget_name: *mut zend_string = unsafe { diff --git a/crates/stub-parser/tests/cases/optional_object.expected b/crates/stub-parser/tests/cases/optional_object.expected index fd95279..144e2e7 100644 --- a/crates/stub-parser/tests/cases/optional_object.expected +++ b/crates/stub-parser/tests/cases/optional_object.expected @@ -1,4 +1,3 @@ - /// Module for `Repository` class. pub(crate) mod Repository { use rsphp_macros_c::{ZEND_ARG_OBJ_INFO, ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE, ZEND_ARG_TYPE_INFO}; @@ -29,7 +28,6 @@ pub(crate) mod Repository { ) }; - class_entry } } @@ -37,7 +35,6 @@ pub(crate) mod Repository { pub(crate) mod Oid { use rsphp_sys::{ZEND_ACC_FINAL, ZEND_ACC_NOT_SERIALIZABLE, ZEND_ACC_NO_DYNAMIC_PROPERTIES, zend_class_entry}; - /// Register the `Oid` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -50,7 +47,6 @@ pub(crate) mod Oid { ) }; - class_entry } } @@ -58,7 +54,6 @@ pub(crate) mod Oid { pub(crate) mod Signature { use rsphp_sys::{ZEND_ACC_FINAL, ZEND_ACC_NOT_SERIALIZABLE, ZEND_ACC_NO_DYNAMIC_PROPERTIES, zend_class_entry}; - /// Register the `Signature` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -71,7 +66,6 @@ pub(crate) mod Signature { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/parameter_types.expected b/crates/stub-parser/tests/cases/parameter_types.expected index dd00c83..a440b2d 100644 --- a/crates/stub-parser/tests/cases/parameter_types.expected +++ b/crates/stub-parser/tests/cases/parameter_types.expected @@ -31,4 +31,3 @@ pub(crate) const ARGINFO_CLASSMASKUNION: [zend_internal_arg_info; 2] = [ ZEND_ARG_INFO_FOR_FUNCTION_WITH_RETURN_TYPE_MASK!(0, 1, MAY_BE_VOID, 0), ZEND_ARG_OBJ_TYPE_MASK!(0, "param", "stdClass", MAY_BE_LONG|MAY_BE_BOOL, NULL), ]; - diff --git a/crates/stub-parser/tests/cases/property_defaults.expected b/crates/stub-parser/tests/cases/property_defaults.expected index 3da76f9..0a5361b 100644 --- a/crates/stub-parser/tests/cases/property_defaults.expected +++ b/crates/stub-parser/tests/cases/property_defaults.expected @@ -1,10 +1,8 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_EMPTY_ARRAY, ZVAL_EMPTY_STRING, ZVAL_FALSE, ZVAL_INTERNED_STR, ZVAL_LONG, ZVAL_NULL, ZVAL_TRUE}; use rsphp_sys::{MAY_BE_ANY, ZEND_ACC_PUBLIC, zend_class_entry, zend_declare_typed_property, zend_string, zend_string_init, zend_string_release, zval}; - /// Register the `Demo` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -39,7 +37,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_is_null_name); } - + let mut property_bool_false_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_FALSE!(std::ptr::from_mut::(&mut property_bool_false_default_value)); } let property_bool_false_name: *mut zend_string = unsafe { @@ -62,7 +60,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_bool_false_name); } - + let mut property_bool_true_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_TRUE!(std::ptr::from_mut::(&mut property_bool_true_default_value)); } let property_bool_true_name: *mut zend_string = unsafe { @@ -85,7 +83,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_bool_true_name); } - + let mut property_str_empty_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_EMPTY_STRING!(std::ptr::from_mut::(&mut property_str_empty_default_value)); } let property_str_empty_name: *mut zend_string = unsafe { @@ -108,7 +106,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_str_empty_name); } - + let mut property_str_other_default_value: zval = unsafe { std::mem::zeroed() }; let property_str_other_default_str = unsafe { zend_string_init(c"foo".as_ptr(), "foo".len(), true) }; @@ -133,7 +131,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_str_other_name); } - + let mut property_arr_empty_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_EMPTY_ARRAY!(std::ptr::from_mut::(&mut property_arr_empty_default_value)); } let property_arr_empty_name: *mut zend_string = unsafe { @@ -156,7 +154,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_arr_empty_name); } - + let mut property_int_5_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_LONG!(std::ptr::from_mut::(&mut property_int_5_default_value), 5); } let property_int_5_name: *mut zend_string = unsafe { diff --git a/crates/stub-parser/tests/cases/property_flags.expected b/crates/stub-parser/tests/cases/property_flags.expected index 471803b..8f7a74e 100644 --- a/crates/stub-parser/tests/cases/property_flags.expected +++ b/crates/stub-parser/tests/cases/property_flags.expected @@ -1,10 +1,8 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_UNDEF}; use rsphp_sys::{MAY_BE_ANY, ZEND_ACC_FINAL, ZEND_ACC_PRIVATE, ZEND_ACC_PRIVATE_SET, ZEND_ACC_PROTECTED, ZEND_ACC_PROTECTED_SET, ZEND_ACC_PUBLIC, ZEND_ACC_PUBLIC_SET, ZEND_ACC_READONLY, ZEND_ACC_STATIC, zend_class_entry, zend_declare_typed_property, zend_string, zend_string_init, zend_string_release, zval}; - /// Register the `Demo` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -39,7 +37,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_is_public_name); } - + let mut property_is_protected_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_is_protected_default_value)); } let property_is_protected_name: *mut zend_string = unsafe { @@ -62,7 +60,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_is_protected_name); } - + let mut property_is_private_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_is_private_default_value)); } let property_is_private_name: *mut zend_string = unsafe { @@ -85,7 +83,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_is_private_name); } - + let mut property_pub_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_pub_readonly_default_value)); } let property_pub_readonly_name: *mut zend_string = unsafe { @@ -108,7 +106,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_pub_readonly_name); } - + let mut property_prot_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_prot_readonly_default_value)); } let property_prot_readonly_name: *mut zend_string = unsafe { @@ -131,7 +129,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_prot_readonly_name); } - + let mut property_priv_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_priv_readonly_default_value)); } let property_priv_readonly_name: *mut zend_string = unsafe { @@ -154,7 +152,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_priv_readonly_name); } - + let mut property_pub_pub_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_pub_pub_readonly_default_value)); } let property_pub_pub_readonly_name: *mut zend_string = unsafe { @@ -177,7 +175,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_pub_pub_readonly_name); } - + let mut property_pub_prot_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_pub_prot_readonly_default_value)); } let property_pub_prot_readonly_name: *mut zend_string = unsafe { @@ -200,7 +198,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_pub_prot_readonly_name); } - + let mut property_pub_priv_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_pub_priv_readonly_default_value)); } let property_pub_priv_readonly_name: *mut zend_string = unsafe { @@ -223,7 +221,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_pub_priv_readonly_name); } - + let mut property_prot_prot_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_prot_prot_readonly_default_value)); } let property_prot_prot_readonly_name: *mut zend_string = unsafe { @@ -246,7 +244,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_prot_prot_readonly_name); } - + let mut property_prot_priv_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_prot_priv_readonly_default_value)); } let property_prot_priv_readonly_name: *mut zend_string = unsafe { @@ -269,7 +267,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_prot_priv_readonly_name); } - + let mut property_priv_priv_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_priv_priv_readonly_default_value)); } let property_priv_priv_readonly_name: *mut zend_string = unsafe { @@ -292,7 +290,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_priv_priv_readonly_name); } - + let mut property_is_static_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_is_static_default_value)); } let property_is_static_name: *mut zend_string = unsafe { @@ -315,7 +313,7 @@ pub(crate) mod Demo { unsafe { zend_string_release(property_is_static_name); } - + let mut property_is_final_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_is_final_default_value)); } let property_is_final_name: *mut zend_string = unsafe { @@ -347,7 +345,6 @@ pub(crate) mod ReadonlyClass { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_UNDEF}; use rsphp_sys::{MAY_BE_ANY, ZEND_ACC_PUBLIC, ZEND_ACC_READONLY, ZEND_ACC_READONLY_CLASS, zend_class_entry, zend_declare_typed_property, zend_string, zend_string_init, zend_string_release, zval}; - /// Register the `ReadonlyClass` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; diff --git a/crates/stub-parser/tests/cases/tentative_return.expected b/crates/stub-parser/tests/cases/tentative_return.expected index e8d3efc..9dfaa3c 100644 --- a/crates/stub-parser/tests/cases/tentative_return.expected +++ b/crates/stub-parser/tests/cases/tentative_return.expected @@ -1,4 +1,3 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_macros_rs::{ZEND_ARG_INFO_FOR_FUNCTION_WITH_RETURN_OBJ_INFO, ZEND_ARG_INFO_FOR_FUNCTION_WITH_RETURN_TYPE_MASK}; @@ -33,7 +32,6 @@ pub(crate) mod Demo { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/cases/typed_properties.expected b/crates/stub-parser/tests/cases/typed_properties.expected index 9e80d27..bf36a5e 100644 --- a/crates/stub-parser/tests/cases/typed_properties.expected +++ b/crates/stub-parser/tests/cases/typed_properties.expected @@ -1,10 +1,8 @@ - /// Module for `RSGit\Commit` class. pub(crate) mod RSGit_Commit { use rsphp_macros_c::{ZEND_TYPE_INIT_CLASS, ZVAL_UNDEF}; use rsphp_sys::{ZEND_ACC_FINAL, ZEND_ACC_NOT_SERIALIZABLE, ZEND_ACC_NO_DYNAMIC_PROPERTIES, ZEND_ACC_PUBLIC, ZEND_ACC_READONLY, zend_class_entry, zend_declare_typed_property, zend_string, zend_string_init, zend_string_release, zval}; - /// Register the `RSGit\Commit` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -46,7 +44,7 @@ pub(crate) mod RSGit_Commit { unsafe { zend_string_release(property_id_name); } - + let mut property_author_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_author_default_value)); } let property_author_name: *mut zend_string = unsafe { @@ -76,7 +74,7 @@ pub(crate) mod RSGit_Commit { unsafe { zend_string_release(property_author_name); } - + let mut property_committer_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_committer_default_value)); } let property_committer_name: *mut zend_string = unsafe { @@ -166,7 +164,6 @@ pub(crate) mod RSGit_Signature { use rsphp_macros_c::{ZEND_TYPE_INIT_CLASS, ZEND_TYPE_INIT_MASK, ZVAL_UNDEF}; use rsphp_sys::{MAY_BE_STRING, ZEND_ACC_FINAL, ZEND_ACC_NOT_SERIALIZABLE, ZEND_ACC_NO_DYNAMIC_PROPERTIES, ZEND_ACC_PUBLIC, ZEND_ACC_READONLY, zend_class_entry, zend_declare_typed_property, zend_string, zend_string_init, zend_string_release, zval}; - /// Register the `RSGit\Signature` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -201,7 +198,7 @@ pub(crate) mod RSGit_Signature { unsafe { zend_string_release(property_name_name); } - + let mut property_email_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_email_default_value)); } let property_email_name: *mut zend_string = unsafe { @@ -224,7 +221,7 @@ pub(crate) mod RSGit_Signature { unsafe { zend_string_release(property_email_name); } - + let mut property_time_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_time_default_value)); } let property_time_name: *mut zend_string = unsafe { diff --git a/crates/stub-parser/tests/cases/variadic_param.expected b/crates/stub-parser/tests/cases/variadic_param.expected index 26d00bb..f7cbedc 100644 --- a/crates/stub-parser/tests/cases/variadic_param.expected +++ b/crates/stub-parser/tests/cases/variadic_param.expected @@ -1,4 +1,3 @@ - /// Module for `Demo` class. pub(crate) mod Demo { use rsphp_macros_c::ZEND_ARG_VARIADIC_TYPE_INFO; @@ -25,7 +24,6 @@ pub(crate) mod Demo { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/verification-cases/functions.expected b/crates/stub-parser/tests/verification-cases/functions.expected index c29822b..1a2cb41 100644 --- a/crates/stub-parser/tests/verification-cases/functions.expected +++ b/crates/stub-parser/tests/verification-cases/functions.expected @@ -5,4 +5,3 @@ use rsphp_sys::{MAY_BE_VOID, zend_internal_arg_info}; pub(crate) const ARGINFO_TEST1: [zend_internal_arg_info; 1] = [ ZEND_ARG_INFO_FOR_FUNCTION_WITH_RETURN_TYPE_MASK!(0, 0, MAY_BE_VOID, 0), ]; - diff --git a/crates/stub-parser/tests/verification-cases/interface_registration.expected b/crates/stub-parser/tests/verification-cases/interface_registration.expected index 2d2321c..10784f7 100644 --- a/crates/stub-parser/tests/verification-cases/interface_registration.expected +++ b/crates/stub-parser/tests/verification-cases/interface_registration.expected @@ -211,7 +211,6 @@ fn verify_registration( pub(crate) mod CustomCasting_CastableTarget { use rsphp_sys::{IS_UNDEF, zend_class_entry, zend_enum_add_case_cstr}; - /// Register the `CustomCasting\CastableTarget` enum. pub(crate) fn register_enum() -> *mut zend_class_entry { let class_entry: *mut zend_class_entry = unsafe { @@ -227,7 +226,6 @@ pub(crate) mod CustomCasting_CastableTarget { zend_enum_add_case_cstr(class_entry, c"CAST_LONG".as_ptr(), std::ptr::null_mut()); }; - class_entry } } @@ -268,7 +266,6 @@ pub(crate) mod CustomCasting_HasCustomCast { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/verification-cases/method_attribs.expected b/crates/stub-parser/tests/verification-cases/method_attribs.expected index 770ff65..c52592f 100644 --- a/crates/stub-parser/tests/verification-cases/method_attribs.expected +++ b/crates/stub-parser/tests/verification-cases/method_attribs.expected @@ -245,7 +245,6 @@ pub(crate) mod Demo { ) }; - unsafe { let fn_ptr: *mut zend_function = zend_hash_str_find_ptr( std::ptr::from_ref::(&(*class_entry).function_table), diff --git a/crates/stub-parser/tests/verification-cases/methods.expected b/crates/stub-parser/tests/verification-cases/methods.expected index c2130ff..c48d6f6 100644 --- a/crates/stub-parser/tests/verification-cases/methods.expected +++ b/crates/stub-parser/tests/verification-cases/methods.expected @@ -274,7 +274,6 @@ pub(crate) mod Demo { ) }; - class_entry } } diff --git a/crates/stub-parser/tests/verification-cases/namespaced_semi.expected b/crates/stub-parser/tests/verification-cases/namespaced_semi.expected index 7eeb67a..318a88d 100644 --- a/crates/stub-parser/tests/verification-cases/namespaced_semi.expected +++ b/crates/stub-parser/tests/verification-cases/namespaced_semi.expected @@ -246,7 +246,6 @@ pub(crate) mod Demo_InDemoNamespace { ) }; - class_entry } } @@ -254,4 +253,3 @@ pub(crate) mod Demo_InDemoNamespace { pub(crate) const ARGINFO_DEMO_INDEMONAMESPACE: [zend_internal_arg_info; 1] = [ ZEND_ARG_INFO_FOR_FUNCTION_WITH_RETURN_TYPE_MASK!(0, 0, MAY_BE_VOID, 0), ]; - diff --git a/crates/stub-parser/tests/verification-cases/no_methods.expected b/crates/stub-parser/tests/verification-cases/no_methods.expected index 7b9e24a..9addcc6 100644 --- a/crates/stub-parser/tests/verification-cases/no_methods.expected +++ b/crates/stub-parser/tests/verification-cases/no_methods.expected @@ -1,10 +1,8 @@ - /// Module for `Example` class. pub(crate) mod Example { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_UNDEF}; use rsphp_sys::{MAY_BE_STRING, ZEND_ACC_FINAL, ZEND_ACC_NOT_SERIALIZABLE, ZEND_ACC_NO_DYNAMIC_PROPERTIES, ZEND_ACC_PUBLIC, ZEND_ACC_READONLY, zend_class_entry, zend_declare_typed_property, zend_string, zend_string_init, zend_string_release, zval}; - /// Register the `Example` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -39,7 +37,7 @@ pub(crate) mod Example { unsafe { zend_string_release(property_first_name); } - + let mut property_second_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_second_default_value)); } let property_second_name: *mut zend_string = unsafe { @@ -70,7 +68,6 @@ pub(crate) mod Example { pub(crate) mod MyBoolean { use rsphp_sys::{IS_UNDEF, zend_class_entry, zend_enum_add_case_cstr}; - /// Register the `MyBoolean` enum. pub(crate) fn register_enum() -> *mut zend_class_entry { let class_entry: *mut zend_class_entry = unsafe { @@ -85,7 +82,6 @@ pub(crate) mod MyBoolean { zend_enum_add_case_cstr(class_entry, c"False".as_ptr(), std::ptr::null_mut()); }; - class_entry } } @@ -93,7 +89,6 @@ pub(crate) mod MyBoolean { pub(crate) mod Marker { use rsphp_sys::zend_class_entry; - /// Register the `Marker` interface. pub(crate) fn register_interface() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -104,7 +99,6 @@ pub(crate) mod Marker { ) }; - class_entry } } diff --git a/example/rust-ext-demo/src/ini_demo_arginfo.rs b/example/rust-ext-demo/src/ini_demo_arginfo.rs index 6bd1c30..627c4e6 100644 --- a/example/rust-ext-demo/src/ini_demo_arginfo.rs +++ b/example/rust-ext-demo/src/ini_demo_arginfo.rs @@ -268,7 +268,6 @@ pub(crate) mod IniDemo { ) }; - class_entry } } diff --git a/example/rust-ext-demo/src/opaquedata_arginfo.rs b/example/rust-ext-demo/src/opaquedata_arginfo.rs index a5fd63a..e6faff0 100644 --- a/example/rust-ext-demo/src/opaquedata_arginfo.rs +++ b/example/rust-ext-demo/src/opaquedata_arginfo.rs @@ -264,7 +264,6 @@ pub(crate) mod RustDemo_OpaqueData { ) }; - class_entry } } diff --git a/example/rust-ext-demo/src/rustdemo_arginfo.rs b/example/rust-ext-demo/src/rustdemo_arginfo.rs index 42fc1ab..3de6950 100644 --- a/example/rust-ext-demo/src/rustdemo_arginfo.rs +++ b/example/rust-ext-demo/src/rustdemo_arginfo.rs @@ -348,7 +348,6 @@ pub(crate) mod PropertiesDemo { use rsphp_macros_c::{ZEND_TYPE_INIT_MASK, ZVAL_UNDEF}; use rsphp_sys::{MAY_BE_ANY, ZEND_ACC_FINAL, ZEND_ACC_PRIVATE, ZEND_ACC_PRIVATE_SET, ZEND_ACC_PROTECTED, ZEND_ACC_PROTECTED_SET, ZEND_ACC_PUBLIC, ZEND_ACC_PUBLIC_SET, ZEND_ACC_READONLY, ZEND_ACC_STATIC, zend_class_entry, zend_declare_typed_property, zend_string, zend_string_init, zend_string_release, zval}; - /// Register the `PropertiesDemo` class. pub(crate) fn register_class() -> *mut zend_class_entry { let mut ce: zend_class_entry = unsafe { std::mem::zeroed() }; @@ -383,7 +382,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_is_public_name); } - + let mut property_is_protected_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_is_protected_default_value)); } let property_is_protected_name: *mut zend_string = unsafe { @@ -406,7 +405,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_is_protected_name); } - + let mut property_is_private_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_is_private_default_value)); } let property_is_private_name: *mut zend_string = unsafe { @@ -429,7 +428,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_is_private_name); } - + let mut property_pub_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_pub_readonly_default_value)); } let property_pub_readonly_name: *mut zend_string = unsafe { @@ -452,7 +451,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_pub_readonly_name); } - + let mut property_prot_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_prot_readonly_default_value)); } let property_prot_readonly_name: *mut zend_string = unsafe { @@ -475,7 +474,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_prot_readonly_name); } - + let mut property_priv_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_priv_readonly_default_value)); } let property_priv_readonly_name: *mut zend_string = unsafe { @@ -498,7 +497,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_priv_readonly_name); } - + let mut property_pub_pub_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_pub_pub_readonly_default_value)); } let property_pub_pub_readonly_name: *mut zend_string = unsafe { @@ -521,7 +520,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_pub_pub_readonly_name); } - + let mut property_pub_prot_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_pub_prot_readonly_default_value)); } let property_pub_prot_readonly_name: *mut zend_string = unsafe { @@ -544,7 +543,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_pub_prot_readonly_name); } - + let mut property_pub_priv_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_pub_priv_readonly_default_value)); } let property_pub_priv_readonly_name: *mut zend_string = unsafe { @@ -567,7 +566,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_pub_priv_readonly_name); } - + let mut property_prot_prot_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_prot_prot_readonly_default_value)); } let property_prot_prot_readonly_name: *mut zend_string = unsafe { @@ -590,7 +589,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_prot_prot_readonly_name); } - + let mut property_prot_priv_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_prot_priv_readonly_default_value)); } let property_prot_priv_readonly_name: *mut zend_string = unsafe { @@ -613,7 +612,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_prot_priv_readonly_name); } - + let mut property_priv_priv_readonly_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_priv_priv_readonly_default_value)); } let property_priv_priv_readonly_name: *mut zend_string = unsafe { @@ -636,7 +635,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_priv_priv_readonly_name); } - + let mut property_is_static_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_is_static_default_value)); } let property_is_static_name: *mut zend_string = unsafe { @@ -659,7 +658,7 @@ pub(crate) mod PropertiesDemo { unsafe { zend_string_release(property_is_static_name); } - + let mut property_is_final_default_value: zval = unsafe { std::mem::zeroed() }; unsafe { ZVAL_UNDEF!(std::ptr::from_mut::(&mut property_is_final_default_value)); } let property_is_final_name: *mut zend_string = unsafe {